modified legend and frustration score color scheme
Merge branches 'sandra' and 'master'