q
Merge branch 'home-laptop' of https://github.com/malsjalbl/contractor into home-laptop
Merge branch 'home-laptop' of https://github.com/malsjalbl/contractor
into home-laptop

Conflicts:
	contractor/src/main/webapp/static/app/common/dialog/dialog-error.html
Wed Night