[Merged](https://github.com/aerogear/aerogear-controller-demo/commit/1bc1c7fc0835e39c02961d629c43521538e8fdee)
[Merged](https://github.com/aerogear/aerogear-controller-demo/commit/1bc1c7fc0835e39c02961d629c43521538e8fdee)