s
x
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/data/api.txt
	js/logFcn.js
url zan
join
js
find.js
hurry
hurry
1127
index
mine
find
index water
x