Fixes a bug where code is not highlighted properly if twig is mixed in an HTML tag and Sphinx thinks it's invalid HTML.
Add another search example.
Stuff.
Merge branch 'master' of github.com:pixelandtonic/Craft-Docs

Conflicts:
	source/_static/css/docs.css
	source/diving-in/routes.rst
Clean Up
logo
Merge branch 'master' of github.com:pixelandtonic/Craft-Docs

Conflicts:
	source/installing/requirements.rst
Assets work.
More cleaning up.
Updating installing for people who can't access the folder above webfoot.
Starting work on updating field type template information.
More cleaning up.
CP -> Assets