Added email support
Merge branch 'develop' of github.com:2359media/PMS-Server into email
Added email support
Added email support
UI improvements and Email support