temporarily removed twilio code
Merge branch 'master' of https://github.com/ATOM49/IpSum

Conflicts:
	db.sqlite3
	shops/models.pyc
	shops/urls.pyc
	shops/views.pyc
post-conflict