Allow colors to be toggled on/off in Color Picker - U4-4935
Merge branch '7.1.4' into colorpicker-toggle
U4-4928 - issue with missing media content properties
U4-4928 - issue with missing media content properties
U4-4928 - issue with missing media content properties
U4-4956 UserService.SavePassword method always throws a not supported exception
Merge branch '6.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.4

Conflicts:
	src/Umbraco.Web/Models/PublishedContentBase.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
Merge pull request #383 from imulus/colorpicker-toggle

Allow colors to be toggled on/off in Color Picker - U4-4935
U4-4914 Add icon for 'Import Document Type' action menu
Updated en.xml to fix some minor spelling mistakes
Fixes: U4-4999 Image cropper - Image file duplicated each time the page (content) is saved/published
Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page
minor change, using non obsolete user id
Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page
Merge remote-tracking branch 'origin/6.2.1' into 7.1.4
Fixes: U4-4945 Slider type stops working on ajax load in 7.1.3
Fixes: U4-4950 U7.1.3 multiple media picker
Extra open namespace for hackers
U4-4752 No "change password" dialog available in 7.x backoffice
U4-4773 - bring back IPublishedContentProperty Alias and Version (compat)