gamestyle
Merge branch 'master' of https://github.com/Faibk/eqtn

Conflicts:
	js/model/eqt-xml-store.js