adaptation of new model - first round
Merge branch 'master' of https://github.com/johaasi/High8

Conflicts:
	js/app.js