Lehrplan, neue Klassen Item und Content
Merge branch 'master' of https://github.com/Sepp1314/MyLearnSpace

Conflicts:
	config/routes.rb
	db/schema.rb