Fixed bug in GameElementLoader.java
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefenseFinal
fixed how levels progress
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0

Conflicts:
	src/vooga/towerdefense/factories/waveactionfactories/WaveActionFactory.java
	src/vooga/towerdefense/model/Player.java
added annotations to action factories
fixed action xml loader, added player xml loader, some enum changes
fixed merge conflicts
fixed placing a tower on the map
Fixing up action and adding more to the general package.