updating and pulling from evan
Merge branch 'evan' of https://github.com/jacoblwright/hit into jake

Conflicts:
	src/model/ItemManager.java
ContainerDao done but not tested
updated sql statements
Merge branch 'jake' of https://github.com/jacoblwright/hit into evan
Implemented factories