Added Ordering Fucntionality
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	frontend/js/dashboardCtrl.js
	frontend/js/dashboardService.js
	frontend/partials/dashinfo.html