event info
Merge branch 'master' of github.com:TrangPham/sms-event

Conflicts:
	app/controllers/incoming_controller.rb
settings call