fix del yama for admin, save about block state
conflict hosting fix
Merge pull request #45 from vatseek/7762

fix del yama for admin, save about block state
Merge remote-tracking branch 'origin/dev'