added file check on photo_picture uploader
Merge branch 'master' into bootstrap