validates email only if present
Merge branch 'master' of github.com:grrrisu/dawning
merge master