Merge branch 'master'
Merge branch 'master'
#34 ItemEditor，BatchEditor bug 調整 part 2
Merge branch 'Route'
Merge branch 'origin/master'

Conflicts:
	extjs-app/metadata/controller/BatchRouteGridController