JSON works correctly now
Merge origin/master

Conflicts:
	src/de/kletterfreak98/vertretungsplan/server/Cache.java
Merge commit '7c86e11e97a3ffd92ba64e562fda6bfd7ec70e86'
Merge commit 'cc976905ebcb4b15f380e72f65273bb70796749f'
Merge devel
Merge devel
Merge origin/master
Upgraded to API version 7
.gitignore working now
.gitignore is working NO ;)