tim
Merge remote-tracking branch 'origin/test1' into test1

Conflicts:
	lost.js
Merge remote-tracking branch 'origin/test1' into test1
Merge remote-tracking branch 'origin/test1' into test1
Merge remote-tracking branch 'origin/test1' into test1
tim
Merge remote-tracking branch 'origin/test1' into test1