Added all location buttons to PainEval View
Merge remote-tracking branch 'origin/master'