Merge branch 'master' into feature/24-icons
re #24 - Fixing both icon tutorials by testing them extensively
Merge branch 'master' into feature/24-icons

Conflicts:
	build/GLOSSARY.html
	build/extensions/docman/custom-icons.html
	build/extensions/docman/plugins.html
	build/extensions/logman.html
	build/extensions/logman/plugins/README.html
	build/extensions/logman/plugins/activities.html
	build/extensions/logman/plugins/joomla.html
	build/extensions/logman/plugins/nooku.html
	build/extensions/logman/translations.html
	build/framework/bootstrap.html
	build/framework/layouts.html
	build/framework/overrides.html
	build/framework/template-system.html
	build/index.html
	build/tools/composer/creating.html
	build/tools/composer/faq.html
	build/tools/composer/installing.html
	build/tools/composer/introduction.html
	build/tools/console/faq.html
	build/tools/console/installation.html
	build/tools/console/introduction.html
	build/tools/console/usage.html
	build/tools/vagrant/faq.html
	build/tools/vagrant/howto.html
	build/tools/vagrant/introduction.html
re #24 - merged latest master back to branch
build
small change
Published with https://stackedit.io/
Merge branch 'feature/24-icons' of github.com:joomlatools/developer.joomlatools.com into feature/24-icons
re#24 slight editing
 re#24 cleaner TOC
Merge branch 'feature/24-icons' of github.com:joomlatools/developer.joomlatools.com into feature/24-icons
re #24 - added link to custom CSS article
 re#24 consistency in headers (only enforcing h1 caps)
Merge branch 'feature/24-icons'
 re#24 committing build