remove unnecessary tag_choices block from models.py to avoid confusion
Merge remote-tracking branch 'origin/develop' into develop
resolve merge conflict on blog_index_page.html