Merge branch 'master' into gh-pages
update

anch 'master' into gh-pages

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ui
ui
ui
more ui
fixed typo
Merge branch 'gh-pages'
typo
Merge branch 'gh-pages'
typo fix
Merge branch 'gh-pages'
typo fix

yes another one
Merge branch 'gh-pages'
much more ui and typo
better performance
Merge branch 'gh-pages'
added settings
Merge branch 'gh-pages'
fix