some changes
should be cancel
cancel too
Revert 48fe96b..682115b

This rolls back to commit 48fe96bd86d09ae8a61ed93ba55aeb38e144d290.
Fixed
Merge branch 'Atlas_3' into Master_2
iPad Version fixed
commit
push
controller
Merge branch 'Atlas_3' into Master_2