updater-script review
Aroma review
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/updater-script
misc
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental
misc
misc
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental

Conflicts:
	META-INF/com/google/android/aroma-config
aroma: Handle non-existing build.prop
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental