Merge branch 'master' into docs_derp

Conflicts:
	docs/assets/css/docs.css

diff --cc docs/_includes/footer.html
Simple merge

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/assets/js/application.js
Simple merge

diff --cc docs/components.html
Simple merge

diff --cc docs/css.html
Simple merge

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