Merge pull request #3033 from annando/1612-object-type

The object type "photo" is deprecated and was replaced by "image"

diff --cc include/diaspora.php
Simple merge

diff --cc include/like.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc mod/subthread.php
Simple merge

diff --cc mod/tagger.php
Simple merge