Merge branch 'master' into GS-add-database

Conflicts:
	Gemfile
	Gemfile.lock
	models/asset.rb
	private_server.rb
	views/uploads/index.slim
	views/uploads/show.slim