styles and new dessign
Merge remote-tracking branch 'origin/master'

Conflicts:
	jbpm-form-modeler-core/jbpm-form-modeler-service/jbpm-form-modeler-form-editor/src/main/webapp/formModeler/components/WysiwygFormEdit/component.jsp
Merge remote-tracking branch 'origin/master'
styles and new dessign