AROMA: Add support for kernel + recovery combo (Xperia M)
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into nicki-cm-experimental

Conflicts:
	META-INF/com/google/android/aroma-config