Fix picture upload
Fix default picture and file selection
Merge pull request #339 from krazemon/upload

Fix picture upload