Image editor check-in
Merge branch '5.7.0-wip' of https://github.com/concrete5/concrete5 into 5.7.0-wip

Conflicts:
	web/concrete/css/ccm.app.css
	web/concrete/css/ccm.gathering.display.css
	web/concrete/js/ccm.app.js
	web/concrete/js/ccm.conversations.pretty.js