Enhance attributes management refs  #511
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/views/pe_attributes/index.erb