Changed emailer text
Merge branch 'develop'

Conflicts:
	config/environments/development.rb