fixed conflicts
Messages properties added
Bugs relatedto persisting structure fixed (objects and services)
Pagination bug fixed
pulled from remote repo branch and resolved conflicts
added listing report list left and right arrow scroll hover arrows
Merge remote-tracking branch 'upstream/listing-module' into listing-module
ajaxModel method removed from listing controller
playing around with the equipment report list
Merge branch 'listing-module' into customised-report-impl
noCost property added to existing structure and errors fixed
Functions for listing report reviewd
fixed predefined and saved reports list for all reports, added method to retrieve a user's saved reports, added delete node js to listing js, and add listing controller method to display a saved inventory report when clicked, but need to look into performance
Conflicts resolved
saving report options function added to structure
saving report options function added to structure and persisted
Saving options to display property added to the structure
Saving options to display property added to the structure
Merge branch 'customised-report-impl' into listing-module
updates to equipment listing reports list and filter summary