Stundenplan version mit map
Merge branch 'master' into new

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/new' into new
.gitignore added and .idea ignored