Assorted fix for crop system
Merge branch 'develop' of github.com:seotoaster-team/seotoaster into develop