Added conditions to Email Service
Merge branch 'develop' of github.com:2359media/PMS-Server into develop