Merge branch 'master' of github.com:peruggia/fly-html
Karik replaced with AngularJS