Merge remote-tracking branch 'origin/DIAM-120' into DIAM-127
Merge remote-tracking branch 'origin/DIAM-120' into DIAM-127
#DIAM-164 Create New Separate Context
#DIAM-165: Implement Strategy
#DIAM-165: Implement Strategy, remove processing impl from services
#DIAM-165: Implement Strategy, add type for message parameter
DIAM-145
Merge remote-tracking branch 'origin/master' into DIAM_123_EmailProcessing
#DIAM-167: Cli Interface, general processing to be used for job server
DIAM-148 One icon file
Merge branch 'DIAM-54' into DIAM-56
DIAM-153 merge code, fix javascript, move dropzone
DIAM-152, DIAM-154, DIAM-155, DIAM-156
DIAM-155
#DIAM-165: Implement Strategy
#DIAM-167: Cli Interface, command for work with pipe
#DIAM-169 Implement ZendMail Adapter
Merge remote-tracking branch 'origin/DIAM_123_EmailProcessing' into DIAM_123_EmailProcessing

Conflicts:
	EmailProcessing/Api/Impl/EmailProcessingServiceImpl.php
	Tests/EmailProcessing/Api/Impl/EmailProcessingServiceImplTest.php
#DIAM-169 Implement ZendMail Adapter
 - fixed conflicts
#DIAM-168 Extend System Configuration