Fixed email check.
Merge branch 'develop' of github.com:clubmaster/clubmaster into develop

Conflicts:
	CHANGELOG