Merge branch 'ui'
Ui Changes
Merge branch 'ui'
post review comments
array check
Merge branch 'ui'
Merge branch 'master' into ui

Conflicts:
	Thomson/app/views/dashboard.php