Merge branch 'develop' into v6.3

author Kevin Ball <kmball11@gmail.com>

Mon, 11 Jul 2016 16:57:20 +0000 (09:57 -0700)

committer Kevin Ball <kmball11@gmail.com>

Mon, 11 Jul 2016 16:57:20 +0000 (09:57 -0700)
author Kevin Ball <kmball11@gmail.com>
Mon, 11 Jul 2016 16:57:20 +0000 (09:57 -0700)
committer Kevin Ball <kmball11@gmail.com>
Mon, 11 Jul 2016 16:57:20 +0000 (09:57 -0700)
diff --cc docs/pages/responsive-navigation.md
Simple merge
diff --cc js/foundation.accordionMenu.js
Simple merge
diff --cc js/foundation.tooltip.js
Simple merge
diff --cc scss/components/_table.scss
Simple merge
diff --cc scss/grid/_flex-grid.scss
Simple merge
diff --cc scss/settings/_settings.scss
Simple merge
author	Kevin Ball <kmball11@gmail.com>
	Mon, 11 Jul 2016 16:57:20 +0000 (09:57 -0700)
committer	Kevin Ball <kmball11@gmail.com>
	Mon, 11 Jul 2016 16:57:20 +0000 (09:57 -0700)
		1	2
docs/pages/responsive-navigation.md	patch \|	diff1 \|	diff2 \|	blob \| history
js/foundation.accordionMenu.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/foundation.tooltip.js	patch \|	diff1 \|	diff2 \|	blob \| history
scss/components/_table.scss	patch \|	diff1 \|	diff2 \|	blob \| history
scss/grid/_flex-grid.scss	patch \|	diff1 \|	diff2 \|	blob \| history
scss/settings/_settings.scss	patch \|	diff1 \|	diff2 \|	blob \| history