ActionMailer saves to file in development env
correct setup instructions
add new tests
delete trailing spaces
fallback for alternative
Merge branch 'release'
pre-merge
Merge branch 'master' of github.com:fairnopoly/fairnopoly

Conflicts:
	app/controllers/auctions_controller.rb
	app/helpers/application_helper.rb
	app/models/auction/attributes.rb
	app/views/libraries/index.html.haml
	config/locales/auction/de.yml
	config/locales/gems/formtastic/de.yml
	spec/factories/auctions.rb
correct merge
changes to friendly_percent_result because 0 is true
refactor README
add more auction specs
update contribution information
add more model specs
ER-Modelling added
Merge branch 'master' of github.com:fairnopoly/fairnopoly
last fixes for auction alternatives
merge
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
Merge branch 'release'