Fixed key enter
Merge branch 'master' into gh-pages

Conflicts:
	src/ts/controller.ts