Refactoring #3
Merge pull request #1 from VEINHORN/Watchlist-app-android-1.01

Refactoring #3