时间：2014年6月25日22:39:52
just-doing
项目整理
Merge branch 'master' of https://github.com/hstarorg/CSharp

Conflicts:
	EaterCamp/EaterCamp.sln
Merge branch 'master' of https://github.com/hstarorg/CSharp

Conflicts:
	EaterCamp/EaterCamp.sln
	EaterCamp/Hstar.EaterCamp.IBLL/IAccountBll.cs