Update to forms
Merge branch 'master' of github.com:alvar21/clubs_2232

Conflicts:
	project/clubs/forms.py

"Fixed conflict"
Merge branch 'master' of github.com:alvar21/clubs_2232