Update Project according to Android Studio 0.8.0
Merge remote-tracking branch 'origin/master'