Merge branch 'origin/master'
pptest
Merge branch 'pipitest'
#1 batch update,read complete
Merge branch 'pipi'
Merge branch 'origin/master'

Conflicts:
	extjs-app/.architect