removed white spaces
fixed service yaml file and removed unused code from swiftmailer module
updated doctrine service
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop'