tried enabling the debugger. didnt work
Merge branch 'master' of github.com:Oammix/starter-2.2

Conflicts:
	Resources/src/app.js
Merge branch 'master' of github.com:Oammix/starter-2.2
minor changes
Merge branch 'master' of github.com:Oammix/starter-2.2

Conflicts:
	Resources/src/entities.js
Merge branch 'master' of github.com:Oammix/starter-2.2
Merge branch 'master' of github.com:Oammix/starter-2.2
Merge branch 'master' of github.com:Oammix/starter-2.2

Conflicts:
	Resources/src/app.js
	Resources/src/entities.js
	Resources/src/hvs.js
Merge branch 'master' of github.com:Oammix/starter-2.2

Conflicts:
	Resources/src/entities.js
remove old stuff