Fixed navigation (initial parameters for build & branch)
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngUSD-client/app/scripts/controllers/navigation.js