fixing DI issues with routeProvider resolve
Merge remote-tracking branch 'origin/gh-pages-final'