Updating build tools
Merge branch 'develop' into feature/androidasync
Using `commit` instead of `apply`
Add new android license
Merge branch 'develop' into issue/124-unavailable-method
Removing ic_launcher and unnecessary attributes
Merge branch 'issue/124-unavailable-method' into develop
Merge branch 'develop' into feature/androidasync

Conflicts:
	Simperium/src/androidTestSupport/res/drawable-hdpi/ic_launcher.png
	Simperium/src/androidTestSupport/res/drawable-ldpi/ic_launcher.png
	Simperium/src/androidTestSupport/res/drawable-mdpi/ic_launcher.png
	Simperium/src/androidTestSupport/res/drawable-xhdpi/ic_launcher.png