upload and choose images through redactorJS
Change version
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	cms/plugins/redactor/media/js/redactor.js