heaby
Merge branch 'master' of https://github.com/farean/hackathon

Conflicts:
	Framework/Service/Service.csproj
Merge branch 'master' of https://github.com/farean/hackathon.git