Changed button text
Merge branch 'testfeature'