Fixes loading developers
Fixes Tiles rotation fixes
Merge branch 'master' into mauricio

Conflicts:
	src/models/Game.java
Conflicts
Merge branch 'mauricio'
Commented Out some test code
Commented Out more test code
merging with master