Implements Client-side Access Token path
Merge branch 'test' of https://github.com/TransitPal/Commutr into Joy

Conflicts:
	client/www/index.html
	client/www/js/app.js
	client/www/js/controllers.js
	client/www/templates/login.html
Resolves merge conflicts
Implements getting user ID