Merge branch 'master' into docs_dir

diff --cc Gruntfile.js
Simple merge

diff --cc docs/assets/js/raw-files.js
Simple merge

diff --cc docs/customize.html
Simple merge

diff --cc docs/getting-started.html
Simple merge

diff --cc docs/javascript.html
Simple merge