Added the rest feature.  Any class that inherits from DataContext has a reset command.  To reset run "ant our-server -Dwipe=true"
Merge branch 'master' of https://github.com/reedcwilson/catan

Conflicts:
	build.xml
	src/com/catan/main/server/Server.java
Added wipping methods.  Run "ant our-server -Dwipe=true"