proper fxml in fxmapview, better ui for store
merge
merge?!
Merge branch 'test' of https://github.com/thomas4g/2340 into test

Conflicts:
	src/edu/gatech/mule/game/resources/ResourceType.java
added more ESC to store menus
removing mule from entities  when added to properties
Merge branch 'test' of https://github.com/thomas4g/2340 into test