nankai-2
Merge branch 'nankai'

Conflicts:
	com.tiptimes.tp/readme.rtf