Merge pull request #114 from Technicolour/development

Added Email Support
Merge branch 'master' of github.com:Technicolour/ResistanceOnline into development