add group class
Merge remote-tracking branch 'origin/master' into dev_zch
modify Model
modify Controller
change braces