pagination fixed again
add worker to fix file bugs
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Fix layout bugs on welcome page and in footer

Conflicts:
	app/assets/stylesheets/controller/welcome.css.scss
Merge branch 'master' of github.com:fairnopoly/fairnopoly
hotfix - fix file fixer to fix files
Merge branch 'master' into develop

Conflicts:
	app/assets/stylesheets/controller/welcome.css.scss
	app/assets/stylesheets/layout/_footer.scss
HOTFIX: Fix too tall coop image on smartphones
test lograge
Update README.rdoc
test implementing rails admin statistics
Fixed #1139: Set new forum link
merged
merged
Merge branch 'develop' into feature-chewy-search