Merge branch 'release-3.1.0'

Conflicts:
	.gitignore
	affiliate.php
	affiliatepsds.zip
	breadcrumbs.shtml
	debug.shtml
	docs/affiliate.php
	docs/breadcrumbs.shtml
	docs/forms.shtml
	docs/images/bg_icon_affiliates.png
	docs/images/bg_icon_events.png
	docs/images/bg_icon_news.png
	docs/images/bg_icon_resources.png
	docs/images/grid_Monitor.png
	docs/images/promo2_kaneko.jpg
	docs/images/promos/fieldGuide.jpg
	docs/user_tests/.htaccess
	docs/user_tests/box.png
	docs/user_tests/config.sample.php
	docs/user_tests/dump.php
	docs/user_tests/flag.png
	docs/user_tests/flag.shtml
	docs/user_tests/goldeneye.php
	docs/user_tests/images/dropdown_slice.png
	docs/user_tests/images/select_slice.png
	docs/user_tests/mega.shtml
	docs/user_tests/navDemo.mp4
	docs/user_tests/navDemo.webm
	docs/user_tests/nav_tests.css
	docs/user_tests/nav_tests.js
	docs/user_tests/navigation/1.html
	docs/user_tests/navigation/10.html
	docs/user_tests/navigation/2.html
	docs/user_tests/navigation/3.html
	docs/user_tests/navigation/4.html
	docs/user_tests/navigation/5.html
	docs/user_tests/navigation/6.html
	docs/user_tests/navigation/7.html
	docs/user_tests/navigation/8.html
	docs/user_tests/navigation/9.html
	docs/user_tests/results.shtml
	docs/user_tests/test.html
	forms.shtml
	images/bg_icon_affiliates.png
	images/bg_icon_events.png
	images/bg_icon_news.png
	images/bg_icon_resources.png
	images/grid_Monitor.png
	images/promo2_kaneko.jpg
	images/promos/fieldGuide.jpg
	sandbox/affiliate.php
	sandbox/breadcrumbs.shtml
	sandbox/forms.shtml
	sandbox/grid.shtml
	sandbox/images/bg_icon_affiliates.png
	sandbox/images/bg_icon_events.png
	sandbox/images/bg_icon_news.png
	sandbox/images/bg_icon_resources.png
	sandbox/images/grid_Monitor.png
	sandbox/images/promo2_kaneko.jpg
	sandbox/images/promos/fieldGuide.jpg
	sandbox/jquery.shtml
	tests/.htaccess
	tests/box.png
	tests/config.sample.php
	tests/dump.php
	tests/flag.png
	tests/flag.shtml
	tests/goldeneye.php
	tests/images/dropdown_slice.png
	tests/images/select_slice.png
	tests/mega.shtml
	tests/navDemo.mp4
	tests/navDemo.webm
	tests/nav_tests.css
	tests/nav_tests.js
	tests/navigation/1.html
	tests/navigation/10.html
	tests/navigation/2.html
	tests/navigation/3.html
	tests/navigation/4.html
	tests/navigation/5.html
	tests/navigation/6.html
	tests/navigation/7.html
	tests/navigation/8.html
	tests/navigation/9.html
	tests/results.shtml
	tests/test.html
	user_tests/.htaccess
	user_tests/box.png
	user_tests/config.sample.php
	user_tests/dump.php
	user_tests/flag.png
	user_tests/flag.shtml
	user_tests/goldeneye.php
	user_tests/images/dropdown_slice.png
	user_tests/images/select_slice.png
	user_tests/mega.shtml
	user_tests/navDemo.mp4
	user_tests/navDemo.webm
	user_tests/nav_tests.css
	user_tests/nav_tests.js
	user_tests/navigation/1.html
	user_tests/navigation/10.html
	user_tests/navigation/2.html
	user_tests/navigation/3.html
	user_tests/navigation/4.html
	user_tests/navigation/5.html
	user_tests/navigation/6.html
	user_tests/navigation/7.html
	user_tests/navigation/8.html
	user_tests/navigation/9.html
	user_tests/results.shtml
	user_tests/test.html
	wdn/templates_3.0/build/compress.php
	wdn/templates_3.0/css/all.css
	wdn/templates_3.0/css/content/basestyles.css
	wdn/templates_3.0/css/content/headers.css
	wdn/templates_3.0/css/content/tabs.css
	wdn/templates_3.0/css/content/titlegraphic.css
	wdn/templates_3.0/css/content/zenbox.css
	wdn/templates_3.0/css/designtime.css
	wdn/templates_3.0/css/header/header.css
	wdn/templates_3.0/css/mobile.css
	wdn/templates_3.0/css/script.css
	wdn/templates_3.0/css/variations/mobile.css
	wdn/templates_3.0/examples/events.html
	wdn/templates_3.0/examples/index.shtml
	wdn/templates_3.0/scripts/all.js
	wdn/templates_3.0/scripts/all_uncompressed.js
	wdn/templates_3.0/scripts/global_functions.js
	wdn/templates_3.0/scripts/idm.js
	wdn/templates_3.0/scripts/mobile.js
	wdn/templates_3.0/scripts/mobile_uncompressed.js
	wdn/templates_3.0/scripts/toolbar_tourmaps.js
	wdn/templates_3.0/scripts/toolbar_weather.js
	wdn/templates_3.0/scripts/tooltip.js
	wdn/templates_3.0/scripts/wdn.js
	wdn/templates_3.1/css/fonts/fonts.css
	wdn/templates_3.1/scripts/carousel.js
	wdn/templates_3.1/scripts/events.js
	wdn/templates_3.1/scripts/tabs.js
Merge remote-tracking branch 'upstream/develop' into develop