fix
Merge branch 'fix_temp_phpThumb' into develop