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