Merge branch 'hotfix/updates'
Add new PaperFaces portraits
Remove protected tweet
Limit atom feed to 25 posts
Convert &mdash; and &ndash; into HTML entities
Merge branch 'hotfix/updates' into develop