Fixed device and namespace controllers
Merge branch 'master' of github.com:ajwerner/safe