Merging uss-frontend to uss-django app