Edit view mode functionality
Merge branch 'master' of https://github.com/sojj/wushumushu