Merge remote-tracking branch 'upstream/develop' into develop
Max out grid columns in print to provide cleaner layouts. Close #521
Merge branch 'develop' of github.com:unl/wdntemplates into column-printing
Update tabs.js to better support dynamically adding tabs.
Merge pull request #538 from tsteiner/develop

Update tabs.js to better support dynamically adding tabs.
Add size specification to h6 headings

Without a size specified for h6, the browser renders the text as 16px which is much
smaller than the body font. This increases the size of the h5 to 1.111 and sets the
h6 size as 1rem.

The h6 header is used in books within the CMS as well as other documents with deep
hierarchy.
Merge pull request #522 from smeranda/column-printing

Max out grid columns in print to provide cleaner layouts. Close #521
Merge remote-tracking branch 'upstream/master' into 4.0-dwt
Allow live editing the examples
slight style changes for events and month widget
missing space
Merge remote-tracking branch 'upstream/4.0' into develop

Conflicts:
	.gitignore
	debug.shtml
Remove templates_3.1 from develop

To get the 3.1 code, checkout the 3.1 branch or
any of the release tags.
Merge branch 'release-4.0'
Convert to old php compatible
Merge remote-tracking branch 'upstream/master' into 4.0-live-edit
Merge pull request #562 from mfairchild365/4.0-live-edit

Redo #559
Add a shortcut for heading font.
Add flex box testing functions.
Expanded search box should overlap site title.