Updated the project to new vaadin version and did minor changes
Merge branch 'master' of https://github.com/Tupsu/java

Conflicts:
	SurveySystem/.classpath
	SurveySystem/.project
	SurveySystem/src/fi/pkamk/surveysystem/SurveySystemApplication.java
	SurveySystem/src/fi/pkamk/surveysystem/model/SurveyFormElement.java
	SurveySystem/src/fi/pkamk/surveysystem/view/SurveyView.java