Google Analytics IP Anonymiesierung
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
Helpermethode-a
Textchanges by compare-a
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
helpermethode payment format-a
Article importer rake task
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

This is an importer for articles.

It fetches data from itemmaster.com and writes them into the db for testing purposes.
implement turbolinks (experimental)
minor doc change
edit profile fix
edit profile fix
article importer script for db and search testing
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

importer script for getting articles from itemmaster.com and writing them into the db
Mock-ups for the fairnopoly website
show no public library notice
devise config changes - closes #63
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	app/controllers/registrations_controller.rb
report article fix
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release