merging user admin ui
Conflicts:
	app/components/user/index.coffee