mid work
fix for edit
Merge branch 'master' of github.com:Praeses/cherry_pie
update assets