Merge branch 'feature/create_file' of /home/git/repositories/gitlab/gitlabhq

app/contexts/base_context.rb

app/contexts/files/base_context.rb

app/contexts/files/create_context.rb

app/contexts/files/update_context.rb

app/controllers/projects/application_controller.rb

app/controllers/projects/base_tree_controller.rb

app/controllers/projects/edit_tree_controller.rb

app/controllers/projects/new_tree_controller.rb

app/controllers/projects/tree_controller.rb

app/views/layouts/nav/_project.html.haml

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

app/views/projects/tree/_tree.html.haml

config/routes.rb

features/project/source/browse_files.feature

features/steps/project/project_browse_files.rb

lib/gitlab/satellite/files/edit_file_action.rb

lib/gitlab/satellite/files/file_action.rb

lib/gitlab/satellite/files/new_file_action.rb