Cards using code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeltionRooster/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeltionRooster/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeltionRooster/src/main/java/nl/deltionmobiel/rooster/DisclaimerActivity.java