Manipulated routeProvider's resolve to provide an authentication middleware,  this pollutes the dependecies of controllers wired up to the same route so I've used the _ private/hidden convention.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/controllers/admin.js