Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	juice/lesson/lesson_image_refine.php