before merge
Merge branch 'master' into continueActivity
add cardactivities implementation