Finished Tasks and Levels
Merge branch 'master' of github.com:fh-koeln/LevelPad

Conflicts:
	public/controllers/levels/LevelListController.js