more changes
Merge branch 'master' of https://github.com/dbarratt/media-manager

Conflicts:
	MediaManager/ImageModule.cs
	MediaManager/Model/Image.cs
	MediaManager/Scripts/compare.js