w
Merge branch 'master' of https://github.com/yysstory/beautychu.git

Conflicts:
	beautyChuSpring/.classpath
	beautyChuSpring/.gradle/2.1/taskArtifacts/cache.properties.lock
	beautyChuSpring/.gradle/2.1/taskArtifacts/fileHashes.bin
	beautyChuSpring/.gradle/2.1/taskArtifacts/fileSnapshots.bin
	beautyChuSpring/.gradle/2.1/taskArtifacts/outputFileStates.bin
	beautyChuSpring/.gradle/2.1/taskArtifacts/taskArtifacts.bin
	beautyChuSpring/.project
	beautyChuSpring/.settings/org.eclipse.jdt.core.prefs
	beautyChuSpring/.settings/org.eclipse.wst.common.component