NavigationBar customization

Conflicts:
	res/xml/system_settings.xml