Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/gradle.xml
#	.idea/misc.xml
#	.idea/runConfigurations.xml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/aicare/net/cn/sdk/pabulumsdkrepositoryandroid/MainActivity.java
#	app/src/main/java/aicare/net/cn/sdk/pabulumsdkrepositoryandroid/WelcomeActivity.java
#	gradle/wrapper/gradle-wrapper.properties
#	pabulumlibrary/build.gradle

Update jar

Update jar

First submission