Merge remote-tracking branch 'refs/remotes/origin/develop'

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -218,7 +218,7 @@
 
 /* User status */
 "_status_message_"          = "Status message";
-"_status_message_placehorder_"  = "What's your status?";
+"_status_message_placehorder_"  = "What is your status?";
 "_online_status_"           = "Online status";
 "_clear_status_message_"    = "Clear status message";
 "_set_status_message_"      = "Set status message";