changed file ext for JPG
Merge branch 'develop'