Merge branch 'temp_imgcrop' into feature/imagepickerWithJCropAndViewport

Conflicts:
	platform/plugins/Q/web/js/fn/imagepicker.js
	platform/plugins/Q/web/js/fn/viewport.js