Merge remote-tracking branch 'origin/develop' into feature/create-task-in-task-group

Conflicts:
	src/ggrc/assets/javascripts/controllers/modals_controller.js