fix User commonBtn issue
Merge branch 'Route'
Merge branch 'origin/master'

Conflicts:
	extjs-app/metadata/controller/BatchRouteGridController
Merge branch 'master'