Updated for Android Studio 1.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	android-ago-sample/build.gradle
	android-ago/build.gradle
	build.gradle
	gradle/wrapper/gradle-wrapper.properties