change to angularjs
Merge branch 'develop' into gh-pages
updated website
Merge branch 'develop' into gh-pages
updated examples