Simple auth added
Merge branch 'master' into GS-add-auth
Merge pull request #2 from zhulik/GS-add-auth

Simple auth added
Merge branch 'master' into GS-add-uploads-management

Conflicts:
	private_server.rb