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

Conflicts:
	app/models/neuigkeit.rb
Merge branch 'master' of https://github.com/fetsite/fetsite
ressourcify attachment
Merge branch 'master' of https://github.com/andreassteph/fetsite
public to rubrik and object to calentries addecd
Add object to calentries
ADD: picture to themengruppe
CHANGE: Layout auf CSS umgestellt
public neuigkeit/rubrik  -calentry link
add picture to neuigkeit
Merge branch 'master' of https://github.com/HausdorffHimself/fetsite