client auth and api auth linked
Merge branch 'master' of https://github.com/johanpoirier/z-home

Conflicts:
	client/web/index.html
	client/web/js/app.js
	client/web/js/templates.js
	client/web/js/vendor.js