Merge pull request #173 from Focus-Flow/bug/clear-button-translations

Add translations for clear button.
Merge pull request #174 from Focus-Flow/bug/clear-button-test

Make sure tests pass after adding clear button.
Merge remote-tracking branch 'upstream/master'