refactored profiles and collections, material types, devices and software in profile.
Altered Profiles and System Setting pages to reference restructured lookup data.
code cleanup.
merged in latest changes from the master branch.
refactored all classes referencing collection, device, software and material type.
Merge remote-tracking branch 'origin/master' into dsc-123
added amber db service to records in banjo.
minor update.
updated all lookups in SearchController to use the lookups in amberDbService.
refactored the adding and update of tools data.
merged in latest changes from master branch.
updated settings controller to use latest lookups api.
merged in latest change from master branch.
merged latest changes.
merged latest acl changes.
Merge remote-tracking branch 'origin/master' into dsc-123
Merge remote-tracking branch 'origin/master' into dsc-123
updated collection label display for jobs within a project.
Merge pull request #453 from nla/dsc-123

Dsc 123