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

Conflicts:
	src/no/digipost/android/api/ApiAccess.java
	src/no/digipost/android/gui/BaseActivity.java
Merge branch 'master' of github.com:digipost/android
fikset UTF-8 bug
fikset UTF-8 bug

Conflicts:
	src/no/digipost/android/api/JSONConverter.java