Fixed ES-462, ES-460, ES-458, ES-428, ES-410
Merge branch 'master' of https://github.com/globeestate11/estate