Fixed org navigation

Propagated orgId into Org Navigation Menu
Preliminary ui-router inclusion