PEP8 correction
Merged rezo/models.py
Solved some bugs for the survey app