temp
Merge branch 'master' of https://github.com/xfm84/test

Conflicts:
	CloudFarm.suo
baidu tested