+Ori
pptest
Hao+
Merge branch 'origin/pptest'
Merge branch 'BranchHao'
Merge branch 'origin/master'
Merge branch 'master'

Conflicts:
	batch/batchIndex.html