commit because I have to
Merge branch 'master' of https://github.com/nielssj/ITU-SMDP-Group11

Conflicts:
	dk.itu.smdp.group11.survey/src/dk/itu/smdp/group11/survey/generator/SurveyGenerator.xtend
DOT Generator & Merge