Fixed bug on nav, navigation color, and black drawer icon
Merge branch 'master' of github.com:elioht/CalHacks

Conflicts:
	project.properties