Merge branch 'master' into api-useremails

CHANGELOG

app/controllers/projects/network_controller.rb

app/models/group.rb

app/models/project.rb

app/views/devise/sessions/_new_base.html.haml

app/views/profiles/keys/_form.html.haml

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

doc/integration/twitter.md

doc/workflow/gitlab_flow.md

features/project/network_graph.feature

features/steps/project/network_graph.rb

lib/api/entities.rb

lib/backup/database.rb

lib/backup/manager.rb

lib/backup/repository.rb

lib/backup/uploads.rb

lib/gitlab/markdown/relative_link_filter.rb

lib/tasks/gitlab/check.rake

lib/tasks/gitlab/import.rake

spec/features/markdown_spec.rb