pdftesting
Merge branch 'master' of github.com:digipost/android

Conflicts:
	src/no/digipost/android/gui/BaseActivity.java