Made some modifications to the Card class.
Merge branch 'develop' of https://github.com/ericslee/mdo into develop