modified.
Merge branch 'refs/heads/mk2-master' (with additions)

Conflicts:
	TMXMapSample/JSTileMap.m
Click to change maps.
final touches for preliminary mac support.