Merge pull request #1 from csdl/master

pull from csdl
disabled group related scoreboards
preserve the group related scoreboard templates
Merge branch 'master' of github.com:yongwen/makahiki
Merge pull request #551 from yongwen/master

merge disabled group related scoreboards