annotations
Merge branch 'master' of github.com:andreassteph/fetsite

Conflicts:
	app/models/neuigkeit.rb