Merge branch 'hotfix/group_by_fix'
fix
.
.
Revert "."

This reverts commit 391996172251cbd477331d7062018af351a92d25.
.
no message
no message
no message
no message
Revert "no message"

This reverts commit 80f153215fd7095e48259cf46ecc83dd84118a7b.
no message
no message
no message
Merge branch 'release/2.1'

Conflicts:
	app/controllers/home_controller.rb
Fix order accounts for chart
Finish 2.1.1