[CORE-1828] Fixed contact count for groups in the menu view and header
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x