Implemented calculations for surveys.
Merge branch 'master' of https://github.com/chemo/ImmunologySpring.git

Conflicts:
	Immunology/src/main/java/com/immunology/logic/service/calculation/impl/FormCalculatorService.java