Merge branch 'master' into colch-work

Conflicts:
	client/app.js