hub allocation using angular drag drop
merging,fix conflicts
Merge branch 'master' of https://github.com/EdgeComputing/cats
fix fonclicts