Initial branch changes

Switched SDK version to 21
Changed button images
Optimized for Android Studio