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
Fixed the merge conflict errors in the 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'
[SD-835] Fixing KeyError
sd-937 Create a new endpoint for easier filtering of items per stage
Merge pull request #319 from amagdas/tasks-improvements

sd-937 Create a new endpoint for easier filtering of items per stage
fix(item lock) - return the updated content in the payload
SD-768 Display task info on content-item view
fix(item lock) - improve the tests to check for lock/unlock result
[SD-835] Sending response status code as 404 when no user found in AD instead of 400.
[SD-835] Sending response status code as 404 when no user found in AD instead of 400.
Merge pull request #320 from amagdas/tasks-improvements

fix(item lock) - return the updated content in the payload
category vocabulary implementation
Merge branch 'master' into vocabulary

Conflicts:
	settings.py