Coding style fixes
Merge pull request #6 from GrahamCampbell/develop

Coding style fixes
fixed email check in registration
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #7 from panique/develop

Develop