cleanup for following gem versions of money-rails
removed obsolete tests
Merge branch 'master' of github.com:fairnopoly/fairnopoly
improvements for #796
Merge branch 'master' into feature-paypal
test suite refactored
merged
Merge branch 'master' of github.com:fairnopoly/fairnopoly
fixed #804
fixed #803
Merge branch 'develop'
for #800 - SEO for articles#index
Merge branch 'master' into feature-paypal

Conflicts:
	Gemfile.lock