Merge branch 'master' of github.com:gitlabhq/gitlabhq

CHANGELOG

app/assets/javascripts/blob/blob_file_dropzone.js.coffee

app/assets/stylesheets/pages/tree.scss

app/controllers/projects/blob_controller.rb

app/services/files/create_service.rb

app/views/projects/blob/_actions.html.haml

app/views/projects/blob/_replace.html.haml

app/views/projects/blob/_upload.html.haml

app/views/projects/blob/new.html.haml

app/views/projects/blob/show.html.haml

config/routes.rb

features/project/source/browse_files.feature

features/steps/project/source/browse_files.rb