gmail renamed to smtp for better genericness
Merge branch 'feedback' of https://github.com/adamdruppe/beyondz-platform into adamdruppe-feedback

Conflicts:
	env.sample