Forgotten files
Merge branch 'dev' of https://github.com/Vixys/Project-emAll into dev

Conflicts:
	js/Game.js
	js/TestContext.js