[RG,MK]{refactoring} R3 - edited action bar in settings screen.
Merge branch 'master' of https://github.com/saabhero/sw14_xp_06

Conflicts:
	NAM/AndroidManifest.xml