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

Conflicts:
	com.sg.ui/src/com/sg/ui/part/editor/field/OfficeFileFieldPart.java