updated urls.py and views
Merge branch 'master' of github.com:mromrell/quotadeck-backend

Conflicts:
	apps/public/models.py