Fixed some JSON vs JPA issues. Localized test db
Fixed problems I introduced during the removal of the UIBeans (which will probably be coming back, turns out). Getting better at testing JSON marshalling
Mucking with merging data and UI objects