bugfix & imageUploaderController
merget