merged and change color of text in dialog of adding image to black
Merge remote-tracking branch 'origin/master'