added in upload support
Merge branch 'master' of github.com:diarmuidw/laterview

Conflicts:
	__init__.pyc
	apps/about/__init__.pyc
	apps/about/models.pyc
	apps/about/urls.pyc
	apps/calls/__init__.pyc
	apps/calls/models.pyc
	apps/calls/urls.pyc
	apps/calls/views.pyc
	apps/cameras/__init__.pyc
	apps/cameras/models.pyc
	apps/cameras/mongoobjects.py
	apps/cameras/mongoobjects.pyc
	apps/cameras/timezones.pyc
	apps/cameras/urls.pyc
	apps/cameras/views.py
	apps/cameras/views.pyc
	apps/docs/__init__.pyc
	apps/docs/urls.pyc
	apps/profiles/__init__.pyc
	apps/profiles/admin.pyc
	apps/profiles/models.pyc
	dev.db
	settings.pyc
	urls.pyc