backbone integrated
Merge branch 'master' of https://github.com/qasimaslam/tripscanner

Conflicts:
	api/__init__.pyc
	templates/common_layout.html
	trips/__init__.pyc
	trips/models.pyc
	tripscanner/__init__.pyc
	tripscanner/settings.pyc
	tripscanner/wsgi.pyc