Revert "Revert "Merge pull request #1940 from Wikia/rename-photo-to-image""

This reverts commit 196c5bbe22d700725a0e1402ffa24d95cd7393c1.