Tweaked navigation drawer (17-11-2013, 11.20pm)
Merge branch 'navigation_drawer'

Conflicts:
	bin/Sharloc.apk
	bin/resources.ap_