Restructuring project structure
Restructuring project structure
Merge branch 'restructuring' into dev

Conflicts:
	client/src/app/game/edit/gameEdit.tpl.html
	client/src/app/game/game.tpl.html
Merge branch 'restructuring' into dev

Conflicts:
	client/src/app/game/edit/gameEdit.tpl.html
	client/src/app/game/game.tpl.html