Merge branch 'FLOE-112' into FLOE-128
Merge branch 'master' into FLOE-128
Merge remote-tracking branch 'cindyli/FLOE-125' into FLOE-128
FLOE-128:
- Added OpenSans-Light font
- Added font icon for metadata panel
- name spaced the demo
- styled the metadata panels
- edited the text for the metadata panel form options
- fixed the mobile layout and visual appearance
FLOE-128: Changed the title of the demo. Changed "View HTML" to "View Output HTML". Changed the colour of the OK button on the toolbar to have more contrast.
Merge branch 'master' into FLOE-128

Conflicts:
	demos/html/metadata.html
Merge remote-tracking branch 'cindy/FLOE-125' into FLOE-128
FLOE-128: Removed the inline form styling for URL input field in toolbar, and replaced with Bootstrap grid layout. Also adjusted the text for the URL input label.
Merge branch 'master' into FLOE-128
FLOE-128: Modified layout to use more Bootstrap grids. Hopefully this will fix issues on mobile devices.
FLOE-128: Moved Video URL input and button into the same container so that button doesn't get cropped in Webkit browsers.

Added fluid width styling to Video URL text field so it scales better on smaller devices.
FLOE-128: Reduced the fluid URL text entry field width a little so the button doesn't wrap on mobile layouts.
FLOE-128: Removed redundant markup from the header area. Matches the markup used in FLOE-130.
FLOE-128: Changed the height of the video placeholder so it is more responsive to screen size. Changed the appearance of the Video URL and OK buttons to be more consistent with overall style.
Merge branch 'FLOE-115' into FLOE-128

Conflicts:
	src/html/captions-template.html
Merge branch 'FLOE-115' into FLOE-128
Merge branch 'FLOE-125' into FLOE-128

Conflicts:
	src/html/audio-attributes-template.html
	src/html/audio-template.html
FLOE-128: Fixed formatting and indenting of markup view CSS and HTML files. Modified simpleEditor and markupView so they resemble each other visually. Removed use of OpenSans-Light.
FLOE-128: Removed extra 'eot' typo.
Merge remote-tracking branch 'jhung/FLOE-128'

* jhung/FLOE-128:
  FLOE-128: Removed extra 'eot' typo.
  FLOE-128: Fixed formatting and indenting of markup view CSS and HTML files. Modified simpleEditor and markupView so they resemble each other visually. Removed use of OpenSans-Light.
  FLOE-128: Changed the height of the video placeholder so it is more responsive to screen size. Changed the appearance of the Video URL and OK buttons to be more consistent with overall style.
  FLOE-128: Removed redundant markup from the header area. Matches the markup used in FLOE-130.
  FLOE-128: Reduced the fluid URL text entry field width a little so the button doesn't wrap on mobile layouts.
  FLOE-128: Moved Video URL input and button into the same container so that button doesn't get cropped in Webkit browsers.
  FLOE-128: Modified layout to use more Bootstrap grids. Hopefully this will fix issues on mobile devices.
  FLOE-128: Removed the inline form styling for URL input field in toolbar, and replaced with Bootstrap grid layout. Also adjusted the text for the URL input label.
  FLOE-128: Changed the title of the demo. Changed "View HTML" to "View Output HTML". Changed the colour of the OK button on the toolbar to have more contrast.
  FLOE-128: - Added OpenSans-Light font - Added font icon for metadata panel - name spaced the demo - styled the metadata panels - edited the text for the metadata panel form options - fixed the mobile layout and visual appearance