Versjon 25 - 2.7.5
Merge branch 'master' of https://github.com/digipost/android into send

Conflicts:
	Digipost/build.gradle