fixed little bug before pulling evans updated model code
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick
Merge branch 'jake' of https://github.com/jacoblwright/hit into nick
fixed editing update issue
Push before 5 PM meeting.
Merge branch 'andy' of https://github.com/jacoblwright/hit into jake

Conflicts:
	dist/lib/inventory-tracker.jar
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy

Conflicts:
	dist/lib/inventory-tracker.jar
some things work, persistence does not.
merge evan
removing deleted filesc
merge with nick
Merge branch 'evan' of https://github.com/jacoblwright/hit into jake

Conflicts:
	dist/lib/inventory-tracker.jar
	src/data/DBComprehensiveDAO.java
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy

Conflicts:
	dist/lib/inventory-tracker.jar
working except for product loading
Merge branch 'nick' of https://github.com/jacoblwright/hit into jake

Conflicts:
	plugins/aupcsearchplugin.jar
Merge branch 'jake' of https://github.com/jacoblwright/hit into evan
Merge branch 'nick' of https://github.com/jacoblwright/hit into evan
updated bug fix
Commit before Jake pull
Merge branch 'jake' of https://github.com/jacoblwright/hit into andy
For Jake