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

Conflicts:
	CloudFarm/CloudFarm.csproj
	CloudFarm/data.db3
t