Updated PainEval controller and model, added second view to pain eval
Changing PainEval location selected view
Merge remote-tracking branch 'origin/master'
Update pain eval locations