Upgrade to Android Studio 0.5.1 2
Merge branch 'master' of https://github.com/macosgrove/AndroidBootcampProject