Add extra surveymodel to tests/ classpath gitignore
Merge branch 'master' of https://github.com/smap-consulting/smap-survey-manager

Conflicts:
	test/org/smap/surveyModel/SurveyModelTests.java
Removing conflicts