Removed merge conflicts
Merge branch 'master' of https://github.com/Tadimsky/vooga

Conflicts:
	src/vooga/rts/map/GameMap.java
Added getEntity method to node which returns an interactive entity at the location
Merge remote-tracking branch 'origin/master' into networking-refactoring