Add locked options
Merge remote-tracking branch 'origin/yifan/master'
Starting fresh part of the page
improve refresh part of the page
Finish part of the refresh page
Finish refresh part of the page
before merge with Yifan
Merge remote-tracking branch 'origin/yifan/report'
Teacher new delete
Finish UI for delete and new except Program Page
Merge remote-tracking branch 'origin/yifan/report'
huh
Finish UI of delete and new
Merge remote-tracking branch 'origin/yifan/roster-add-student'
Merge remote-tracking branch 'origin/yifan/roster-add-student'
Merge remote-tracking branch 'origin/Jinqiu'
I am going to replace the select2 gem into external library to fix the css class bug
used select2.js in adding student in roster page
Merge branch 'master' of http://github.com/luzerno/caramel
changed layout of report page