Fix DI
Make promise resolution Angular-aware
Make page a test locale variable
Merge pull request #2293 from opf/fix/flickering_protractor_test

Flickering protractor test
Upgrade Angular to 1.3