...
Merge branch 'master' of https://github.com/istim/istim-games

Conflicts:
	api/policies/isAuthenticated.js
Merge branch 'master' of https://github.com/istim/istim-games
fix policies and tests :octocat: