Angular and UI-Router barebones
Merge remote-tracking branch 'origin/master' into facebooklogin

Conflicts:
	views/layout.ejs