Close display
Merge branch 'fix_ccdevice'
fix collision detection
Merge branch 'fix_cctableview'