Redo django project
Merged with a clean project and fixed problems