WIP
Merge branch 'dev-no-board-updated' into dev-no-board

Conflicts:
	app/public/js/models/Hive.js
	app/public/js/models/Piece.js
	app/public/js/tests-config.js
	spec/specs/clientSpec.js