for git pull
Merge branch 'master' of github.com:getlantern/www.getlantern.org
stashing changes
stashing changes
Merge branch 'master' of github.com:getlantern/www.getlantern.org
don't autoplay video on iOS

closes #31
make sure autoPlay is always defined
make sure autoPlay is set correctly for iPads
use absolute path in image urls in scss

relative image urls break when the site is built because they don't get converted to
point to the versioned ("grunt-revved") version
update to angular 1.2.7
update to es5-shim 2.3.0
update copyright year to 2014
Merge branch 'master' into bootstrap3

* master:
  update copyright year to 2014
  update to es5-shim 2.3.0
  update to angular 1.2.7
  use absolute path in image urls in scss
  make sure autoPlay is set correctly for iPads
  make sure autoPlay is always defined
  don't autoplay video on iOS
  stashing changes
  for git pull

Conflicts:
	app/index.html
	app/styles/_breakpoints.scss
	app/styles/_download.scss
	app/styles/_topbar.scss