Complete - task : Menyval
Merge branch 'master' of https://github.com/fferm/Infektionsdagbok.git

Conflicts:
	Infektionsdagbok/AndroidManifest.xml
	Infektionsdagbok/res/layout/export_view.xml
	Infektionsdagbok/src/se/fermitet/android/infektionsdagbok/activity/ExportActivity.java
	InfektionsdagbokAndroidTest/src/se/fermitet/android/infektionsdagbok/QuestionnaireTestMocked.java