pulling out resolve
Merge branch 'master' of https://github.com/dotJEM/angular-routing