Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

README.md

app/assets/javascripts/merge_request_widget.js.coffee

app/helpers/blob_helper.rb

app/models/project.rb

app/models/project_wiki.rb

app/services/system_note_service.rb

app/views/projects/merge_requests/widget/_heading.html.haml

config/gitlab.teatro.yml

config/initializers/trusted_proxies.rb

...grate/20160508194200_remove_wall_enabled_from_projects.rb

db/schema.rb

doc/api/users.md

doc/ci/docker/using_docker_build.md

doc/ci/docker/using_docker_images.md

doc/ci/examples/README.md

doc/ci/examples/php.md

.../examples/test-and-deploy-python-application-to-heroku.md

...ci/examples/test-and-deploy-ruby-application-to-heroku.md

doc/ci/services/mysql.md