Merge branch 'master' into development

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="19"
-    android:versionName="0.4.1" >
+    android:versionCode="20"
+    android:versionName="0.5-beta" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -107,4 +107,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

CHANGELOG.md

@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 0.5
+* UI overhaul
+* MUC / Conference bookmarks
+* A lot of bug fixes
+
 ####Version 0.4
 * OTR file encryption
 * keep OTR messages and files on device until both parties or online at the same time