Merge branch 'develop'
Merge branch 'develop'
delDefPhoto
add right default photo
Merge branch 'hot-fix/defImage' into develop