Testing branches
fix angular won't load bug
Merge branch 'master' into gh-pages