sms ready 80per
sms and email ready
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/models/client.rb
	app/views/clients/_form.html.erb
	db/development.sqlite3