smaafix til beta
merge fix

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

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