Update
Merge branch 'master' of github.com:baloomba/feeligo_android_sdk

Conflicts:
	build.gradle
	src/main/AndroidManifest.xml