fix zbetagroup project
Merge branch 'feature/modularization' of github.com:wordpress-mobile/WordPress-Android into feature/modularization