ES-371: "Cancel" Button is still not functioning.
Merge branch 'master' of https://github.com/globeestate11/estate