Update plugin_ui.xml, options.xml
Update plugin_ui.xml, options.xml
Update plugin_ui.xml, options.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/plugin_ui.xml