#1 modify Item btn function
Merge branch 'HaoBranch'

Conflicts:
	extjs-app/.architect