Code style cleanup
Merge branch 'master' of https://github.com/akvo/akvo-rsr-mobile.git