141112
fix_server
Merge branch 'feature_blog' into dev
fixed server error
make category
Merge branch 'blog_category' into dev

category make
make_category
complete_category
Merge branch 'category' into dev
blogs add function category
comment_complete
Merge branch 'dashboard'
category tag comment complete