Merge pull request #1 from friendica/master

Pull from upstream
Added url tag around image for inserted links
Merge pull request #797 from anaqreon/imagelink

Imagelink