Video resize bug in ipad
Merge branch 'master' of https://github.com/Click3X/XXXXXX_heardcity_website-2014

Conflicts:
	www/sass/base/_base.scss
	www/stylesheets/screen.css