remove console log
Merge branch 'master' into caber2

Conflicts:
	client/pages/home.js