fixed another bug: cancel is now working on edit page
Merge branch 'master' of https://github.com/ylang/18-641Java