On swipe, the comments tab sometimes disappears - hopefully this fixes it
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Merge branch 'master' of github.com:guardian/frontend
Large gallery image recipe
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
Update registration username check error handling
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