sort refactoring
Merge remote-tracking branch 'origin/develop' into develop
WORDS-459: Android: Create sorting functionality in UI