Git fixed again
Merge branch 'master' of https://github.com/elferrus7/mrpg

Conflicts:
	Client Test/assets/www/js/grid.js