neu ordnen des projekts
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/socialfunnel/vaadin/Headline.java
	src/main/java/com/socialfunnel/vaadin/MainpageView.java
	src/main/java/com/socialfunnel/vaadin/RegisterView.java
	src/main/java/softwarengineering/SocialFunnel/MyVaadinUI.java