hei hei
Merge branch 'master' of https://github.com/pan-long/KLTTrackerOnAndroid

Conflicts:
	gradle/wrapper/gradle-wrapper.properties