Merge branch 'master' into ui

Conflicts:
	Thomson/app/views/dashboard.php
shortlist changes
fixes to shortlist
loads of drop down fixes
Merge branch 'ui'
Merge branch 'ui'