Start work on admin section and refactor API to separate from api endpoints
Merge branch 'master' of github.com:Hephistocles/mabel into admin-section

Conflicts:
	src/api-routes.js
	src/app-routes.js
	views/main.jade
Encode user group membership in the token to avoid mysql lookups
Merge branch 'master' of github.com:Hephistocles/mabel into admin-section

Conflicts:
	src/app-routes.js
Write token to a cookie when the user has logged in
Merge branch 'master' of github.com:Hephistocles/mabel into admin-section