getSatisfaction button added
Merge branch 'Working_branch'