Signed-off-by: ghuazh <ghuazh@gmail.com>
Merge branch 'master' of https://github.com/sgewuhan/vision.git

Conflicts:
	com.sg.widgets/META-INF/MANIFEST.MF
	com.sg.widgets/src/com/sg/widgets/registry/config/DataEditorConfigurator.java

Signed-off-by: ghuazh <ghuazh@gmail.com>