working on api
Merge branch 'dev' of github.com:codaxy/dextop into dev

Conflicts:
	Tests/Codaxy.Dextop.Tests/Codaxy.Dextop.Tests.csproj