fix mailer
sprite
sprite
Merge branch 'asd' into develop

Conflicts:
	app/assets/javascripts/application.js