made changes to Lantern according to the wireframe
adding new assets
edited en_US.json for new FAQ content
added new picture, made video larger, fixed faq section
merge work on new design, resolve conflicts, fix some breakage

* 'master' of https://github.com/evanhtmlfusion/www.getlantern.org:
  added new picture, made video larger, fixed faq section
  edited en_US.json for new FAQ content
  adding new assets
  made changes to Lantern according to the wireframe

Conflicts:
	app/index.html
	app/styles/_footer.scss
fix second email signup form