ok
Merge branch 'master' of https://github.com/mantiswang/song

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml