Merge branch 'shama-master' into 2.0.1-wip

diff --cc docs/base-css.html
Simple merge

diff --cc docs/components.html
Simple merge

diff --cc docs/javascript.html
Simple merge

diff --cc docs/less.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
Simple merge

diff --cc docs/templates/pages/components.mustache
Simple merge

diff --cc docs/templates/pages/javascript.mustache
Simple merge

diff --cc docs/templates/pages/less.mustache
Simple merge

diff --cc docs/templates/pages/upgrading.mustache
Simple merge

diff --cc docs/upgrading.html
Simple merge