changed angularjs to refer from json data instead from static js content
Merge branch 'gh-page'
Merge branch 'gh-page' into master
merged gh-page into master