Bye Bye Holo Blue Light

Conflicts:
	res/layout/nav_bar.xml