updating for client
Merge branch 'master' into production

Conflicts:
	js/main.js