Cleanup CardReaderEntity
Changed CardHelper to not depend on non-API code
Version update