Recent working copy after demos
Merge branch 'master' of https://github.com/ajain8/Guardian-REST

Conflicts:
	app/routes.js