Prepare for next development iteration
Fix crash when session is somehow null on back
Move to Android Studio and Gradle