code clean up
Demo update
code cleanup
code cleanup
ok
Merge branch 'feature/select_cell' into develop
changed class name