test2
Merge branch 'master' of https://github.com/weitaolee/FCFramework

Conflicts:
	NHPersistence/Class13.cs