CE upstream

@iamphill All these conflicts are frontend related, could you resolve/reassign them?
```
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both added:      app/assets/javascripts/application.js
	both added:      app/assets/javascripts/confirm_danger_modal.js
	both added:      app/assets/javascripts/dispatcher.js
	both added:      app/assets/javascripts/groups_select.js
	both added:      app/assets/javascripts/lib/utils/common_utils.js
	both added:      app/assets/javascripts/merge_request_widget.js
	both added:      app/assets/javascripts/notes.js
	both added:      app/assets/javascripts/project_new.js
	both added:      app/assets/javascripts/users_select.js
	both modified:   app/views/projects/branches/index.html.haml
```

See merge request !595