1 versuech
2nd try
Merge remote-tracking branch 'origin/master'

Conflicts:
	AgrarAlpha_v1/src/com/gwt/client/MainView.java
Merge branch 'master' of https://github.com/SEprojektteam2/sewinf