infrastructure steps
Merge remote-tracking branch 'origin/master'

Conflicts:
	web4thejob-studio/src/main/java/org/web4thejob/studio/DesignerController.java
	web4thejob-studio/src/main/webapp/js/designer.js