working on settings test
Merge branch 'master' of github.com:TrangPham/sms-event
settings working
Merge branch 'master' of github.com:TrangPham/sms-event

Conflicts:
	test/functional/incoming_controller_test.rb