refactoring
Merge branch 'master' of https://github.com/martchouk/clickandbuy.api.java