adding stub and admin service
formatting
resolving conflicts
Merge branch 'master' of https://github.com/Wihidum/NewEmailMonitor into mergincentral
resolving conflicts
Merge pull request #25 from isururanawaka/master

Adding stub and Admin Service