Revert "Revert "Merge pull request #1939 from Wikia/ve-sprint-5""

This reverts commit 6f2cf6b663194e195415419c3a0d7796eb0d97ad.
Revert "Merge pull request #1940 from Wikia/rename-photo-to-image"

This reverts commit f1bf5769f48b1bcb4001579601d737d5423f0fa4, reversing
changes made to 76c62e4ef03a975f7eb2787d6f54dba67555c4a0.

Conflicts:
	extensions/VisualEditor/wikia/modules/ve/ui/dialogs/ve.ui.WikiaMediaInsertDialog.js
Merge pull request #1942 from Wikia/ve-sprint-5

Ve sprint 5