Conflicts:
	app/views/shared/issuable/_filter.html.haml
	lib/api/api.rb