solved bug not exiting when android back button is pushed
Merge branch 'bug-android-back-button-not-exiting' into dev