Added jpeg support
Merge branch 'master' of github.com:uclataubetapi/tbpsite