#225 Loading and converting Board to show it as a tree
Merge branch 'jstree' into dev

Conflicts:
	client/bower.json
	client/build.config.js
	client/src/app/game/edit/gameEdit.js
Solving merge issues (JS replaced with Coffee)
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	client/bower.json
	client/build.config.js
	client/src/app/app.coffee
	client/src/app/game/edit/gameEdit.coffee