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

Conflicts:
	src/vooga/rts/map/GameMap.java
Basic refactoring
Merge branch 'networking-refactoring' of https://github.com/Tadimsky/vooga into networking-refactoring
Added getEntity method to node which returns an interactive entity at the location
added messages/fleshed out client
Merge branch 'networking-refactoring' of https://github.com/Tadimsky/vooga into networking-refactoring
JD ClientModel
fixed merges
Edited merge
Merge branch 'networking-refactoring' of https://github.com/Tadimsky/vooga into networking-refactoring
Merge remote-tracking branch 'origin/master' into networking-refactoring
Merge pull request #60 from Tadimsky/networking-refactoring

Networking refactoring
corrected logging
Merge branch 'networking-refactoring' of https://github.com/Tadimsky/vooga into networking-refactoring
Merge pull request #61 from Tadimsky/networking-refactoring

Networking refactoring
Changed default images to use Pixmap
Merge branch 'master' of https://github.com/Tadimsky/vooga
get back deleted upgrade feature. Refactor decoder to take multiple trees in the same file