Fixing checkstyle violations.
Merge branch 'master' of git@github.com:jeukku/waazdoh.client.git