merge dev branch

merge skynet dev branch