edit AppDelegate.m file
Merge branch 'dev-button-fix' into develop