Merge remote-tracking branch 'gsoc2016/Subtitle-1'

diff --cc mediagoblin/db/models.py
Simple merge

diff --cc mediagoblin/edit/views.py
Simple merge

diff --cc mediagoblin/media_types/blog/views.py
Simple merge

diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
Simple merge