PEP 8 contacts/models.py
PEP8 forms_builder/forms/models.py
PEP8 forms_builder/forms/admin.py
Removing commented-out code form form_builder/forms/models.py
PEP8 removing whitespace from events/models.py
Merge branch 'master' of github.com:tendenci/tendenci

Conflicts:
	tendenci/apps/forms_builder/forms/models.py