Fixed some html errors.
Bumped version for release.
Merge branch 'origin/master'