123
Merge branch 'master' of https://github.com/gatoo/Gattoo

Conflicts:
	Gattoo/Gattoo.vcxproj
Conflict resolved