JSON works correctly now
Merge origin/master

Conflicts:
	src/de/kletterfreak98/vertretungsplan/server/Cache.java