testje
model
listview main screen
?
1
Merge branch 'master' of https://github.com/ElvaTeam/elvaApp

Conflicts:
	src/org/elva/elvaapp/CustomCardAdapter.java
	src/org/elva/elvaapp/QuestionnaireActivity.java