Merge branch 'evan' of https://github.com/jacoblwright/hit into jake
Merge branch 'andy' of https://github.com/jacoblwright/hit into jake
Merge branch 'andy' of https://github.com/jacoblwright/hit into jake
updated code with fixed bugs 83 & 84
Merge branch 'andy' of https://github.com/jacoblwright/hit into jake
prep
few changes, checking ur branch
Added some dao class stubs
fixed the phase 3 bugs and squashed the MYSTERY BUG
finished polishing the item batch controllers to follow the func spec
Merge branch 'nick' of https://github.com/jacoblwright/hit