Merge branch 'develop' into test_cases
Mailfactorytests.
ResetPasswordFactoryTest.
Merge branch 'test_cases' into develop