14.8.24 4:40pm

Fixed map generation so it's right side up
2014.8.24 4:43pm take erics' changes?

hopefully this doesn't break us
Merge remote-tracking branch 'origin/tc' into tc

Conflicts:
	engine/maps/test.map
	engine/repo.exe
Merge remote-tracking branch 'origin/tc' into tc

Conflicts:
	engine/maps/test.map
	engine/repo.exe