fixed conflicts
merge with upstream
fix horizontal scroll js
fix firefox UL width
fix scrolling
dynamic navigation
Merge branch 'listing-module' of github.com:siyelo/memms into listing-module
Pagination bug fixed
js scrolling effect
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