fix states
Merge remote-tracking branch 'origin/master'
makes sure that uploads directories exist before starting server
Merge remote-tracking branch 'origin/master'