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
Add Travel Offers lifecycle to dev-build module

To load offers on startup.
Add request metrics to Commercial module
Show random travel offers

Rather than first two in list
pull in main image only for containers; test
adding integration test
Merge pull request #2076 from guardian/facia-main-image

Facia main image
Merge pull request #2078 from guardian/kc-travel-offers

Shuffle Travel Offers