prep
Merge branch 'nick' of https://github.com/jacoblwright/hit into evan
final for July 9
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
Completed ContainerEditorTest, canDeleteContainer() has been tested.
Updated Serializer and Model and tested them; they work.
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
added ChangeType enum
ant clean
fixing merge issues
Merge branch 'nick' of https://github.com/jacoblwright/hit into jake

Conflicts:
	src/model/ItemManager.java
prep
All of my javadocs are up to date
prep
prep
prep
Merge branch 'evan' of https://github.com/jacoblwright/hit into andy

Conflicts:
	src/model/ProductManager.java