Fix merge issue
Merge branch 'drawerlayout-refactoring' into develop

Conflicts:
	serenity-app/AndroidManifest.xml