pic
Merge branch 'master' of https://github.com/zian92/SoPra
Merge branch 'master' of https://github.com/zian92/SoPra
Merge branch 'master' of https://github.com/zian92/SoPra
Obsolet commit
Merge branch 'master' of https://github.com/zian92/SoPra

Conflicts:
	SProject/.classpath
	SProject/src/de/glurak/frontend/login/LoginView.java
Merge branch 'master' of https://github.com/zian92/SoPra
Merge branch 'master' of https://github.com/zian92/SoPra