formatting and default email settings
registration related updated
Merge branch 'develop' of https://github.com/Team-H/gateway into develop