do release 2.5
update libphonenumber
add a number of tablet enhancements
Merge branch 'tablet' into dev

Conflicts:
	app/AndroidManifest.xml
	app/pom.xml
	integration-tests/pom.xml
	pom.xml