Add new tabs to survey according to provided template + change survey to
ajax page reload;
Merge remote-tracking branch 'origin/master'

Conflicts:
	Immunology/src/main/webapp/WEB-INF/pages/user/survey.jsp