Server changes
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API

Message
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Merge branch 'master' of https://github.com/gippy/Ebaut.API
Fixed bug in mail.js