Merge branch 'nch_branch' into develop
# Conflicts:
# .idea/Django.iml
# .idea/misc.xml
# src/DjangoBlog-master(1)/DjangoBlog-master/blog/admin.py
# src/DjangoBlog-master(1)/DjangoBlog-master/blog/context_processors.py
# src/DjangoBlog-master(1)/DjangoBlog-master/comments/admin.py
|