using .png instead of .jpg to avoid showing image fail in some versions
Merge branch 'dev'