Refactor
Updated version to 2.6.0
Refactor
Merge branch 'master' of https://github.com/jyang-phunware/maas-localpoint-android-sdk-1