image file support
Merge branch 'master' into friends
friends