Merge branch 'development' into ava
properly escape path of icon in full view (articles & more)
Merge branch 'ava' into development