AROMA: Make hardware keys in navibar optional
EXPERIMENTAL: Manifest update
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental

Conflicts:
	__build/roomservice.xml
EXPERIMENTAL: Update manifest