Enhance attributes management refs  #511
Enhance attributes management refs  #511
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/views/users/_users.html.erb