Merchant updater fix and refactoring
Tests for merchants updater helper
Merge branch 'master' of github.com:Kein1945/LumiRoMerchantsAndroid