//
Merge branch 'master' of https://github.com/Vallantyn/Deus-Hex-Machina

Conflicts:
	Src/Js/Assets/Views/GameView.js
	Src/Js/Core/Shelf.js