Merge branch 'master' into FLOE-115
Merge branch 'master' into FLOE-115
FLOE-115: Fixed typo and improved some namings.
FLOE-125: Upgraded to the latest Infusion snapshot

Upgraded infusion to get access to the model relay from the preferences framework.
FLOE-125: metadata panel models shared and saved
FLOE-130: Improved styling for HTML output viewer
FLOE-125: missed setting initial model

Missed setting the initial model for the audio panel.
FLOE-125: Created a sidebar component

Created a sidebar component which manages the creation and destruction of the metadata panels.
Merge branch 'master' into FLOE-125
FLOE-125: Using distribute options for templates

Switched back to using distribute options for the templates.
FLOE-130: Cleaned up styling for HTML Output Viewer
Merge branch 'master' into FLOE-130
FLOE-115: Naming improvement and a comment for a future todo.
FLOE-125: Reset metadata at demo restart and video url change.
FLOE-130: Cleaned up styling and formatting for HTML Output Viewer
FLOE-125: progress on resetting metadata panels

Still doesn't reset properly when clicking restart.
FLOE-130: added back syntax highlighting stylesheet.
FLOE-125: Converted sidebar to use the renderer

Using the renderer for the sidebar to get around issues with creating/destroying the metadata panels.
FLOE-125: Improve audio and captions panels.
Merge remote-tracking branch 'justin/FLOE-125' into FLOE-125