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

This reverts commit 506c6d69c543bc79e562311fe80e5f91cf30b8c3.

Conflicts:
	extensions/VisualEditor/wikia/modules/ve/ui/dialogs/ve.ui.WikiaMediaInsertDialog.js