Add the ability to define content with the ImageUpload editor.
Something went wrong with merging
Merge pull request #396 from petedavis/image_upload_registration

Add the ability to define content with the ImageUpload editor.
Merge pull request #398 from jsassner/master

Something went wrong with merging...
Merge branch 'master' of https://github.com/n2cms/n2cms

Conflicts:
	src/Framework/N2/Details/WithEditableTitleAttribute.cs
	src/Framework/N2/Web/Mvc/Html/EditableRegistrationExtensions.cs