Android Studio 1.0 update (gradle and project files modifications).
Merge remote-tracking branch 'origin/master'