fix crop on posts
Merge remote-tracking branch 'upstream/master'
fix admin
Merge remote-tracking branch 'upstream/master'
fix user
Merge remote-tracking branch 'upstream/master'