webhook callbacks working
Merge branch 'master' of github.com:Doula/Doula

Conflicts:
	doula/views/index_view.py