Prom View changes
for merge
Merge branch 'master' of https://github.com/zian92/SoPra

Conflicts:
	SProject/src/de/glurak/data/NewsEntry.java
NewsEntries
merges
Merge branch 'master' of https://github.com/zian92/SoPra