Merge branches 'fix/project-import_url' and 'master' of...

Merge branches 'fix/project-import_url' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url

# Conflicts:
#	db/schema.rb