Several tweaks to the docs.
Updates sass source from develop.
Merging.