added city serach in order event page
merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/lib/angular/angular-ui-utils.js