Merge remote-tracking branch 'origin/master'

Conflicts:
	Immunology/src/main/java/com/immunology/logic/controller/SurveyController.java
	Immunology/src/main/resources/js/plugins/form-builder-new.js
	Immunology/src/main/webapp/WEB-INF/pages/user/survey.jsp
Merge remote-tracking branch 'origin/master'