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