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

Conflicts:
	Apps/Codaxy.Dextop.Showcase/source/ApiGrid.js.html