Fix user menu and report navigation tests
Fix user menu and report navigation tests
Merge branch 'master' into cake-for-one
Added updateindicator mixin, with basic URL tests
changing externalId on indicators and indicatorData to use real indicator Ids