modifies structure of cluster and some controllers
Merge branch 'master' of https://github.com/santiagoRebella/falcon-ui