Added dependencies for Arquillian tests
Added TestBasicEntityCollection, arquillian.xml and test-persistence.xml
Fixed everything
Merge branch 'testing' into dev
Renamed all collections to DAO
Moved bulk add from BasicEntityDAO to EntityInitializer
Added EasyCriteria as dependency
Renamed TestBasicEntityCollection to TestBasicEntityDAO
Implemented getResultList in BasicEntityDAO with EasyCriteria instead of CriteriaBuilder
Merge branch 'sortnfilter3' into dev
Added celleditors
Made id uneditable
Renamed EntityCtrl to CatalogueCtrl
Added ajax events for row edit and row edit cancel to catalogue.xhtml
Added category and unit lists to TableBB
Renamed TableBB to CatalogueBB
Updated references to CatalogueBB
Renamed CatalogueCtrl to NewEntityCtrl
Added new EditEntityCtrl, implemented editable table
Added forgotten pagination (firstResult and maxResult) to the EasyCriteria implementation