Removed method from GameElementXMLLoader.java
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0
refactored model to use Rules and Levels
Checking to see if identity is restored
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0

Conflicts:
	src/vooga/towerdefense/attributes/DefaultAttributeManager.java
	src/vooga/towerdefense/controller/Controller.java
	src/vooga/towerdefense/factories/TowerDefinition.java
	src/vooga/towerdefense/factories/definitions/GameElementDefinition.java
	src/vooga/towerdefense/factories/examples/ExampleAuraTowerFactory.java
Refactored factory. Removed exceptions
Better Logging messages

also some typo fixes...etc
add test patterns, works well
Intergrating, add button works
Merge branch 'Level-Editor' of https://github.com/Tadimsky/vooga into Level-Editor
rearrange Packages
Bugfix for client side
added xml writing for ViewEditorScreen
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0
Fixing up gameelement factory
Server Error Logging fully implemented
Started switching over to the game's map
Was moving, now isn't
merged conflicts
GameElementXMLLoader.java