Merge remote-tracking branch 'origin/master'
				
					
					
# Conflicts:
#	app/build.gradle
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/MainActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/RopeSkippingActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/ShowBleActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/WeightScaleWifiBleActivity.java
#	app/src/main/res/layout/activity_rope_skipping.xml