modified some django files to correct the errors.
Modified some files, fixed some syntax errors and rename some files.