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

Conflicts:
	contractor/src/main/webapp/static/dialog/dialog-confirm.html