fixes a bug
Merge branch 'master' of https://github.com/dirkschumacher/iUPB

Conflicts:
	config/initializers/rabl.rb
fixes a bug caused by rabl (not me ;P)
adds information/war about contained allergens for the restaurants
missing css and better text ; follow up to: 78fd253 adds information/warning about contained allergens for the restaurants
Merge pull request #12 from dirkschumacher/master

adds a warning about allergens at the restaurant page, fixes a bug