Merge branch 'hotfix/group_error' into develop
Merge branch 'hotfix/group_by_fix' into develop
change database for develop
Fix chart
Merge branch 'release/2.1'

Conflicts:
	app/controllers/home_controller.rb