add picture upload support
conflicts resolved
Merge pull request #46 from SIMS-Topaz/aja/picture_upload

add picture upload support