Merge branch 'master' into temporal_icons

oc_jb_workaround/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100000"
+    android:versionCode="0100001"
     android:versionName="1.0" >
 
     <uses-sdk