ActionBar changes
Merge remote-tracking branch 'origin/working_keys' into working_gui

Conflicts:
	AndroidManifest.xml