#18 - Updating SDK to 0.4.0 and removing Strings.isNullOrEmpty() as it Guava is no longer a dependency in the SDK
#18 - Updating versionName to match SDK release for consistency on Google Play Store
#20 - Updating SDK to 0.5.0 release
#20 - Updating version number.  Updating dependencies to latest versions.  Updating Gradle Wrapper to 2.1
#20 - Updating app compat library to latest point release
#20 - Updating Gradle Wrapper task to match the 2.1 upgrade that the IDE did automatically
#21 - Updating versionCode

Merge branch 'master' of github.com:mapbox/mapbox-android-demo

Conflicts:
	MapBoxAndroidDemo/build.gradle
	build.gradle
	gradle/wrapper/gradle-wrapper.properties