add forloop to the json result
Merge branch 'master' of https://github.com/EdgeComputing/cats
add angular controllers / server side action methods to fill ldashboard view
add filtering criteria for lists by region
resolve conflict
fix logical errors on controller and view
fix conflict