pequenas alteracoes
Merge branch 'master' of https://github.com/AndreMitsuoka/pipa_project

Conflicts:
	app/models/sms.rb