fix conflict post && activAdmin
Fail branch
modify tags, categories links
Merge branch 'dev' into 662_modify_blog_page
Merge pull request #36 from is-valid/662_modify_blog_page

662 modify blog page