changes from meeting with texters - for #208
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	config/locales/gems/formtastic/de.yml
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release