bah
asd
Merge branch 'master' of https://github.com/ksmandersen/MDP-Survey

Conflicts:
	smdp.project.survey.SurveyDSL/xtend-gen/smdp/project/survey/generator/HTMLGenerator.java
added classpath and more project specific files, hope it works for you athanasios
Merge branch 'master' of https://github.com/ksmandersen/MDP-Survey