few minor tweaks before final pull from all branches
Merge branch 'andy' of https://github.com/jacoblwright/hit into nick
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick
added ChangeType enum
ant clean
fixing merge issues
Merge branch 'nick' of https://github.com/jacoblwright/hit into jake

Conflicts:
	src/model/ItemManager.java
All of my javadocs are up to date
prep
prep