ref #149 and ref #148 add edit function to user and work
Merge branch 'master' of github.com:html5j/5jcup-site