just deleted commentary
db
Merge branch 'master' of https://github.com/zian92/SoPra

Conflicts:
	SProject/database/Glurak.lck
	SProject/database/Glurak.properties
	SProject/database/Glurak.script
	SProject/src/de/glurak/frontend/mainFrame/content/news/NewsEntry.java
Clean push
Merge branch 'master' of https://github.com/zian92/SoPra