Adding final changes to Controller App
Merge branch 'master' of https://github.com/shawkinsl/netplix