[Tak] Change response
Merge branch 'master' of github.com:phlip9/txtcoin

Conflicts:
	controllers/SMSController.js

merge!