trying to refactor with layout class for animation, getting NSInternalInconsistencyException
fix some 64-bit bugs
wrap initial deal with performbatchupdate
fix crash
Merge branch 'NSInternalInconsistencyException' into dev