change some files for django
Django user authration
fix some confilict files