Issue refs #1311: controller changes
Merge branch 'master' of github.com:olegsmith/apinet-server
Issue refs #1311: update api-client