Merge branch 'cardImport'
Merge branch 'master' of https://github.com/favorspin/magic