ES-913, ES-879
Merge branch 'master' of https://github.com/globeestate11/estate_sprint_4