allow foodcoops to add custom css
try workaround for failing test

(closes foodcoops#303)
allow to set page break options for each document
show articles ordered by members but not by foodcoop dimmed in receive
Bumped new version: 3.3.5-adam
remove html escaping from all text mails

Conflicts:
	app/views/mailer/invite.text.haml
more sensible mailer option defaults

Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml

Conflicts:
	config/app_config.yml.SAMPLE
	spec/app_config.yml
update strings from localeapp

Conflicts:
	config/locales/fr.yml
fix more sensible mailer option defaults