Merge branch 'upgrade/angular-scenario-1.2.0' into ftopia
Merge branch 'feature/timeout-option-for-phantomjs' into ftopia