add the default user_image
fix the conflic
fix the bug
Merge pull request #94 from Jael/master

add the default user_image