Merge branch 'develop' into enable_cookies

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java

diff --cc src/com/owncloud/android/MainApp.java
Simple merge

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 9c42f27,8d7182d..ed68614
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -1596,6 -1546,9 +1594,7 @@@ public class AuthenticatorActivity exte
      /**\r
       * Updates the content and visibility state of the icon and text associated\r
       * to the last check on the ownCloud server.\r
 -     * \r
 -     * @param serverStatusText      Resource identifier of the text to show.\r
 -     * @param serverStatusIcon      Resource identifier of the icon to show.\r
++     *\r
       */\r
      private void showServerStatus() {\r
          if (mServerStatusIcon == 0 && mServerStatusText == 0) {\r