Restructured project
Merge remote-tracking branch 'origin/master'

Conflicts:
	dotWar/src/tests/client/Player.java
Restructured project