Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental

Conflicts:
	META-INF/com/google/android/aroma-config
	META-INF/com/google/android/aroma/langs/gr.lang
	META-INF/com/google/android/updater-script
	_archidroid/exec/bcm4334.sh
	system/app/CMWallpapers.apk
	system/fonts/DroidSansFallback.ttf