Prevent preloading to save bandwidth
Add simple flash video player
Include flash player in video and article templates
Merge branch 'master' of github.com:guardian/frontend into video-fallback
Reorder font declaration order to make more sense
Load EgyptianText regular italic in Windows
Merge branch 'master' of github.com:guardian/frontend into video-fallback
Replace dewTube with mediaelement
Fluid video resize
Test video and fallbacks
Merge branch 'master' of github.com:guardian/frontend into video-fallback

Conflicts:
	applications/test/VideoTemplateTest.scala
	common/app/assets/stylesheets/module/_video.scss
British English
Uppercase HTML5
Remove unused "numerical" table CSS class
Merge pull request #2059 from guardian/webfonts-fixes

Webfonts fixes
Merge pull request #2068 from guardian/video-fallback

Video fallback
Merge branch 'master' of github.com:guardian/frontend into image-sizes

Conflicts:
	applications/app/views/fragments/videoBody.scala.html