fixed a typo in workflow.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	jaxclient/web/workflow.jsp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
typo on last name! come on!