merged with release
letzte aenderung der Startseite
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'release'
Merge branch 'release'
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'release' of github.com:fairnopoly/fairnopoly
Add additional edit category functions for rails_admin
provide proper article image for facebook
new agb
Merge branch 'release'
implement hero link - fixes #486
Merge branch 'master' into develop

Conflicts:
	app/models/category.rb
	config/locales/user/de.yml