IDI-3: Update existing IDI theme to match what's actually currently on the dev site.
IDI-98: Small fix to workshops description.
IDI-102: Fix to the IDI mailing list signup.
IDI-102: Change to mailing list signup
Merge branch 'development'

Conflicts:
	footer.php
	front-page.php
	functions.php
	header.php
	images/_idi_logo.png
	images/idi_logo_bg.png
	infusion/MyInfusion.js
	infusion/components/tableOfContents/js/TableOfContents.js
	infusion/components/tabs/js/Tabs.js
	infusion/components/uiOptions/css/FatPanelUIOptions.css
	infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
	infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
	infusion/components/uiOptions/css/FullPreviewUIOptions.css
	infusion/components/uiOptions/css/FullUIOptions.css
	infusion/components/uiOptions/css/UIOptions.css
	infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
	infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
	infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
	infusion/components/uiOptions/html/FullNoPreviewUIOptions.html
	infusion/components/uiOptions/html/FullPreviewUIOptions.html
	infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
	infusion/components/uiOptions/html/UIOptionsTemplate-links.html
	infusion/components/uiOptions/js/FatPanelUIOptions.js
	infusion/components/uiOptions/js/FullNoPreviewUIOptions.js
	infusion/components/uiOptions/js/FullPreviewUIOptions.js
	infusion/components/uiOptions/js/SlidingPanel.js
	infusion/components/uiOptions/js/UIEnhancer.js
	infusion/components/uiOptions/js/UIOptions.js
	infusion/fluid-components-1.4.war
	infusion/framework/core/js/DataBinding.js
	infusion/framework/core/js/Fluid.js
	infusion/framework/core/js/FluidDOMUtilities.js
	infusion/framework/core/js/FluidDebugging.js
	infusion/framework/core/js/FluidDocument.js
	infusion/framework/core/js/FluidIoC.js
	infusion/framework/core/js/FluidRequests.js
	infusion/framework/core/js/FluidView.js
	infusion/framework/core/js/JavaProperties.js
	infusion/framework/core/js/ModelTransformations.js
	infusion/framework/core/js/jquery.keyboard-a11y.js
	infusion/framework/fss/css/fss-base-context.css
	infusion/framework/fss/css/fss-base-global.css
	infusion/framework/fss/css/fss-layout.css
	infusion/framework/fss/css/fss-mobile-layout.css
	infusion/framework/fss/css/fss-mobile-theme-android.css
	infusion/framework/fss/css/fss-mobile-theme-iphone.css
	infusion/framework/fss/css/fss-reset-context.css
	infusion/framework/fss/css/fss-reset-global.css
	infusion/framework/fss/css/fss-reset.css
	infusion/framework/fss/css/fss-site.css
	infusion/framework/fss/css/fss-text.css
	infusion/framework/fss/css/fss-theme-bw.css
	infusion/framework/fss/css/fss-theme-by.css
	infusion/framework/fss/css/fss-theme-coal.css
	infusion/framework/fss/css/fss-theme-debug.css
	infusion/framework/fss/css/fss-theme-hc.css
	infusion/framework/fss/css/fss-theme-hci.css
	infusion/framework/fss/css/fss-theme-idi-site.css
	infusion/framework/fss/css/fss-theme-idi.css
	infusion/framework/fss/css/fss-theme-mist.css
	infusion/framework/fss/css/fss-theme-rust.css
	infusion/framework/fss/css/fss-theme-slate.css
	infusion/framework/fss/css/fss-theme-wb.css
	infusion/framework/fss/css/fss-theme-yb.css
	infusion/framework/fss/css/fss-transitions.css
	infusion/framework/fss/images/themes/bw/buttons-med-bg.png
	infusion/framework/fss/images/themes/bw/buttons-med-cap.png
	infusion/framework/fss/images/themes/bw/buttons-titlebar-bg.png
	infusion/framework/fss/images/themes/bw/buttons-titlebar-cap.png
	infusion/framework/fss/images/themes/bw/icon-widget-Close.png
	infusion/framework/fss/images/themes/bw/icon-widget-More.png
	infusion/framework/fss/images/themes/bw/icon-widget-gripper.png
	infusion/framework/fss/images/themes/by/buttons-med-bg.png
	infusion/framework/fss/images/themes/by/buttons-med-cap.png
	infusion/framework/fss/images/themes/by/buttons-titlebar-bg.png
	infusion/framework/fss/images/themes/by/buttons-titlebar-cap.png
	infusion/framework/fss/images/themes/by/icon-widget-Close.png
	infusion/framework/fss/images/themes/by/icon-widget-More.png
	infusion/framework/fss/images/themes/by/icon-widget-gripper.png
	infusion/framework/fss/images/themes/wb/buttons-med-bg.png
	infusion/framework/fss/images/themes/wb/buttons-med-cap.png
	infusion/framework/fss/images/themes/wb/buttons-titlebar-bg.png
	infusion/framework/fss/images/themes/wb/buttons-titlebar-cap.png
	infusion/framework/fss/images/themes/wb/icon-widget-Close.png
	infusion/framework/fss/images/themes/wb/icon-widget-More.png
	infusion/framework/fss/images/themes/wb/icon-widget-gripper.png
	infusion/framework/fss/images/themes/yb/buttons-med-bg.png
	infusion/framework/fss/images/themes/yb/buttons-med-cap.png
	infusion/framework/fss/images/themes/yb/buttons-titlebar-bg.png
	infusion/framework/fss/images/themes/yb/buttons-titlebar-cap.png
	infusion/framework/fss/images/themes/yb/icon-widget-Close.png
	infusion/framework/fss/images/themes/yb/icon-widget-More.png
	infusion/framework/fss/images/themes/yb/icon-widget-gripper.png
	infusion/framework/renderer/js/RendererUtilities.js
	infusion/framework/renderer/js/fluidParser.js
	infusion/framework/renderer/js/fluidRenderer.js
	infusion/licenses/LICENSE.txt
	mailinglist.php
	style.css
Merge branch 'master' into IDI-99
IDI-99: Uncommented login tab from uio-markup.php, tweaked styles, and added conditional content depending on login.
IDI-99: Template page for content that will be kept in the database/wp-backend so that it's editable, specifically equipment list pages.
IDI-99: Tab txt changed to 'logout' after login, 'logout' tab immediately logs out, display of username when logged in, login errors displayed within panel, booking icons in fl-cols on booking page
IDI-99: Removed equipment detail files as text will be stored in the db and be editable there.
IDI-99: Fixed tab/panel behaviours for login
IDI-99: Fixed tab/panel behaviours for logout
Merge branch 'IDI-99-heidi' into development
IDI-99: Fix a bug in the sidebar link to download the booking form.
IDI-99: Adding a placeholder PDF booking form.
IDI-99: Fix a small js error
IDI-99: Fixes to ensure the booking FAQ is keyboard accessible
Merge branch 'development' into IDI-99