fi btnType in ng-data to btntype. update README
Merge branch 'master' into gh-pages