Active nav items when url changes
Merge branch 'master' into david-dev

Conflicts:
	app/assets/javascripts/application.coffee