fixed conflict in merging active_card / cleancard
Merge remote branch 'ethan/develop' into develop
merge