Merge branch 'master' of https://github.com/mstearne/Producteev-Web-Form

Conflicts:
	updateLabels.php
update
Merge branch 'master' of https://github.com/mstearne/Producteev-Web-Form