Refactoring #5
Merge pull request #3 from VEINHORN/Watchlist-app-android-1.04

Refactoring #5