resolved error 2 in the server
Merge branch 'master' of github.com:asime/DARSWorkWorld