fix Cannot read property compile of undefined
Merge branch 'angularjs' into gh-pages