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

Conflicts:
	CloudFarm/Program.cs
	Core/Data/Pipeline.cs