Merge branch 'dev' into 680_Image
fix post in active admin
fix post show
Merge pull request #86 from is-valid/680_Image

680 image