# Conflicts:
#	app/assets/javascripts/label_manager.js
#	app/assets/javascripts/main.js
#	app/assets/javascripts/star.js
#	app/controllers/projects_controller.rb
#	app/views/projects/project_members/index.html.haml
#	doc/development/README.md
#	doc/development/testing_guide/testing_levels.md
#	doc/user/permissions.md
#	spec/helpers/groups_helper_spec.rb
#	spec/mailers/notify_spec.rb
[ci skip]