Working routes at last
Update routes
Fix menu to work with angular
Merge branch 'develop'