merge NextDayBookings and ArweLocations requests into list() resquests
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	client/app/controllers/admin/disposition/DispositionController.js
	client/app/routes/admin/disposition/DispositionRoute.js