Added Japanese to the expected language list in ChangeLanguageSpec
Fixed failing PhonesAndConnectionsFSpec
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
Minor format fix.
Removed unused value from ContactController model.
Fixed count of group members in contact show view.
aerge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
ConnectionFSpec fixes
Fixed smart group content count when subsearching by contact name.
ConnectionControllerSpec fixes
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
[CORE-1831] Fixed clicking on Autoforwards in the Activity Archive screen
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
changed functional test for contact count (CORE-1828) into an integration test
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
Udpated app version to SNAPSHOT.
Fixed test logging so hopefully tests are a little faster.
Merge branch 'core-2.x' of github.com:frontlinesms/frontlinesms2 into core-2.x
Fixed build-without-splash launcher.
Added comment to explain why localhost:8080 is not a valid URL.