Current state
Merge branch 'master' of github.com:fh-koeln/LevelPad

Conflicts:
	public/views/tasks/list.html