allow user to select colorblind mode
Merge branch 'master' into deploy14