+ Fix poke activities translation (fabrixxm)
+ Fix html escaping in templates (fabrixxm)
+ Fix Friendica contacts shown as Diaspora contacts via Poco (annando)
+ Fix shared contacts wrong linking (issue #1388) (annando)
+ Fix email validation (ddorian1)