Fix compilation issue
[Task][WIP] Add Routers Management Activity (still works w/ mock data)
Merge remote-tracking branch 'origin/master'