alert taker is inprocess
Merge branch 'master' of https://github.com/qasimaslam/tripscanner

Conflicts:
	api/views.py