changing some capital letters
getName for not located devices
some more stuff
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test