Upgrade build system to gradle
Don't close app on dialog cancel