Android Studio upgrade to 0.5.7
Merge remote-tracking branch 'origin/master'
...