Added Operation UI Support
typo
Merge remote-tracking branch 'origin/master'

Conflicts:
	database
Fixed codeography typo