gui endringer
Merge branch 'redesign' of https://github.com/digipost/android into redesign

Conflicts:
	src/no/digipost/android/gui/MainContentActivity.java
fikset merge..