small fixes
smarter upload path for pictures
Merge branch 'picture_org'