fix comment problems with article, map, picture
Merge branch 'dev'