Image Upload Draft
Merge remote-tracking branch 'origin/master'

Conflicts:
	Collective/Collective.Web/Content/main.css