Interim.
Merge branch 'master' of github.com:Traxmaxx/5A002
Check for logouts and key changes.
Merge branch 'master' of github.com:Traxmaxx/5A002

Conflicts:
	client/scripts/controllers/main.js