Save my changes of new Builder
Merge remote-tracking branch 'origin/master'

Conflicts:
	Immunology/src/main/resources/js/plugins/form-builder-new.js
	Immunology/src/main/webapp/WEB-INF/pages/admin/components/select-syndrom-modal.jsp
	Immunology/src/main/webapp/WEB-INF/pages/user/components/patient-info.jsp
Change url's in new form builder.