Added authentication
Added valid client_id for oauth2
Merge branch 'master' into feature/implement_lifeweb

Conflicts:
	app/js/app_routes.js
	app/templates/master.html.js
	app/templates/template.html
	app/views/header/header.html
	app/views/header/header.html.js
fixed a couple more things and moved files into the same structure I
initially had.
Got about us page working with route.
All the pages more or less run. There are a bunch of errors, but the
pages still load.