merge stuff
Merge branch 'release'
Merge branch 'master' of github.com:fairnopoly/fairnopoly
merged with release
letzte aenderung der Startseite
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'release'
Merge branch 'release'
Fix rails admin category bug
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'release' of github.com:fairnopoly/fairnopoly
Add test
Merge branch 'import' of github.com:fairnopoly/fairnopoly into release
Refactoring
Add press link to footer
typo
Add additional edit category functions for rails_admin
provide proper article image for facebook
new agb
Merge branch 'release'