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-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...