Add quotation where are missing
Merge branch 'master' into S26

Conflicts:
	lib/templates/deploy.batch.basicconsole.template
Add web job deploy script call
0.1.6