fixed step 2 report type status bugs, added a missing list of inventory params, added user-based data location collection, updated custom report name and date format, and switched the order on the general equipment report properties to match the order of the wizard
Merge branch 'listing-module' of github.com:clintonhealthaccess/memms into listing-module