adjust post view in admin
Merge remote-tracking branch 'upstream/master'