new epigame
Merge branch 'master' of github.com:WISE-Community/WISE-VLE

Conflicts:
	src/main/webapp/vle/node/epigame/epigame.js
Merge branch 'master' of github.com:WISE-Community/WISE-VLE