api version up
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android-Tongrenlu-Application/project.properties