After some work done on dispatch center
Merge https://github.com/nanakay/cabconnect

Conflicts:
	css/style.css
	img/ACS_LOGO.png
	index.yaml
	js/user_phonegap.js
	main.py
	models.py