Merge branch 'ui'

Conflicts:
	Thomson/app/views/dashboard.php
review changes
Merge branch 'ui'
Merge branch 'ui'
Merge branch 'master' into ui