initial routing behavior in angular

far from perfect, but routing is set up and views are rendered inside
the ng-view container.
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/userController.js
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit f59514c1b06802366569abfd53e301fa09437b95.
Revert "initial routing behavior in angular"

This reverts commit ba9e5957b17675ef59cd10b94f28484adf3b1913.