Update build.gradle to use Gradle version 0.5 and higher.
Update files for Android Studio 2.1.
Update files for Android Studio 2.1.
Update files for Android Studio 2.1.
Merge branch 'master' into sharing-is-caring

Conflicts:
	PuffinFeeder/build/apk/PuffinFeeder-debug-unaligned.apk
	PuffinFeeder/build/incremental/dex/debug/inputs.data
	PuffinFeeder/build/incremental/mergeAssets/debug/merger.xml
	PuffinFeeder/build/incremental/mergeResources/debug/inputs.data
	PuffinFeeder/build/incremental/mergeResources/debug/merger.xml
	PuffinFeeder/build/incremental/mergeResources/debug/outputs.data
	PuffinFeeder/build/libs/PuffinFeeder-debug.ap_
	PuffinFeeder/build/libs/PuffinFeeder-debug.dex
	PuffinFeeder/build/manifests/debug/AndroidManifest.xml