[SD-846] AAPIngestService did not move files from the directory after the file is processed.
[SD-846] AAPIngestService did not move files from the directory after the file is processed.
 Refactored the AAPIngestService, AFPIngestService
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
[SD-846] Refactoring the code so that AAPIngestService and AFPIngestService are based on FileIngestService.
Merge remote-tracking branch 'upstream/master'
[SD-846] Refactoring the code so that AAPIngestService and AFPIngestService are based on FileIngestService.
Merge remote-tracking branch 'upstream/master'
Merge pull request #305 from mdhaman/master

[SD-846] AAPIngestService did not move files from the directory after processing
feat(user groups) - add support for user groups management
feat(user groups) - add /users/user_id/groups route
Merge pull request #314 from amagdas/groups

feat(user groups) - add support for user groups management
SD-432 : Create a possibility to reset backend's database to some determined state from outside (ie from frontend tests)
SD-432 : Create a possibility to reset backend's database to some determined state from outside (ie from frontend tests)
Merge branch 'master' of https://github.com/ioanpocol/superdesk-server

Conflicts:
	settings.py
Merge pull request #315 from ioanpocol/master

SD-432 : Create a possibility to reset backend's database to some determ...
[SD-835] Endpoint for Adding a New User when AD is active.
SD-47 - As an admin, I would like to be able to localize the text of password-recovery messages

Adde subject as template for all emails that are sent by application
Merge pull request #317 from ioanpocol/master

SD-47 - As an admin, I would like to be able to localize the text of pas...
Merge branch 'SD-835'