tset
Merge branch 'master' of github.com:sky629/Catch

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CatchMindClient/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/CatchMindServer/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/1260249286.index
	.metadata/.plugins/org.eclipse.jdt.core/3593744741.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt