Allow enter key on splash page
Added account hack
Merge branch 'master' into di

Conflicts:
	client/js/client.js