Formulaire de rezotage
Merge branch 'master' of github.com:Lerikio/rezren-sapphire

Conflicts:
	app/assets/javascripts/adherents.js
	app/assets/javascripts/global.js
	app/assets/javascripts/mailing.js
	app/assets/javascripts/payments.js
	app/assets/stylesheets/customs.css.sass
	app/controllers/adherents_controller.rb
	app/helpers/application_helper.rb
	app/models/adherent.rb
	app/models/computer.rb
	app/models/credit.rb
	app/models/payment.rb
	app/views/adherents/_form.html.haml
	app/views/adherents/_new.html.haml
	app/views/adherents/new.js.erb
	app/views/computer_dns_entries/_form.html.haml
	app/views/computers/_form.html.haml
	app/views/layouts/application.html.haml
	app/views/mailings/_form.html.haml
	app/views/mailings/index.html.haml
	app/views/mailings/new.js.erb
	app/views/payments/_form.html.haml
	app/views/payments/index_all.html.haml