refs #396
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/assets/javascripts/projestimate_script.js
small graphical bug on attribute module tab