branch
Merge branch 'nankai'

Conflicts:
com.tiptimes.tp/readme.rtf