Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into fix_247_change-hostname

merging from remote upstream (RocketChat.Android repo)