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

Conflicts:
	com.mobnut.design/src/com/mobnut/design/Design.java
	com.sg.widgets/src/com/sg/widgets/ImageResource.java