repair build stability after prev merge
bring back project stability after merge
Merge branch 'master' of https://github.com/wojtekblack/KrakJamCandy

Conflicts:
	KrakJam2013/KrakJam2013.vcxproj