cancel btn position changed to top right
Merge branch 'develop' of https://github.com/HummingBirdSystem/emenu_android_client into develop