Added car alert, hotel alert and rail alerts features
Merge branch 'master' of https://github.com/qasimaslam/tripscanner

Conflicts:
	api/dao_utils.py
	api/urls.py
	api/views.py
	static/js/router.js
added car, hotel and rail alert feature and cancel account feature