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

Conflicts:
	res/layout/fragment_layout_mailbox.xml
	src/no/digipost/android/gui/BaseActivity.java
liten fix
liste_kjokk_og_arkiv
lister_arkiv_og_kjokk
arkiv_og_kjokkenbenk
Merge branch 'master' of github.com:digipost/android
Merge branch 'kjokkenbenk_og_arkiv'