Uploads management and fixes
Merge branch 'master' into GS-add-uploads-management
Merge branch 'master' into GS-add-uploads-management

Conflicts:
	private_server.rb
Merge pull request #1 from zhulik/GS-add-uploads-management

Uploads management and fixes