Update for tab list page
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/js/views/setup/usersView.js