test code
Merge branch 'Level-Editor' of https://github.com/Tadimsky/vooga into Level-Editor
Merge branch 'Level-Editor' of https://github.com/Tadimsky/vooga into Level-Editor

Conflicts:
	src/vooga/rts/leveleditor/components/EditableTileMap.java