Merge remote-tracking branch 'origin/userdashboard_backend_integration' into userdashboard

Conflicts:
	web/app/components/shortlist/shortlist.js
	web/app/components/shortlist/shortlistcard.js
Merge remote-tracking branch 'origin/userdashboardtest' into userdashboard