version 1.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	NoMoreGrind.cs
	build/GameData/NoMoreGrind/NoMoreGrind.dll