3.2.0
Merge branch 'master' into gh-pages

* master:
  3.2.0
3.2.1
addded dist
comply with jshint
remove html assets from gitignore