REST framework added
Merge branch 'master' of https://github.com/TaxiExpress/server

Conflicts:
	taxiexpress/views.py