iii
iiiMerge branch 'master' of github.com:liufeiit/micro

Conflicts:
	core/.settings/org.eclipse.wst.common.component
	core/src/test/java/META-INF/MANIFEST.MF