done really for pull request
Merge branch 'E734'

Conflicts:
	app/controllers/analytic_controller.rb
	app/models/analytic/assignment_analytic.rb
	app/models/analytic/assignment_team_analytic.rb
	app/models/analytic/course_analytic.rb
	app/views/analytic/index.html.erb