Minor edits to the text
 some more edits to demo text
[#82] Building it up - slowly
 [#82]: Minor correction reading the manifest
[#82] Last bits of resolution panel added ...
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/shared/ad-ex/response.js.coffee
- About us changes
Merge remote-tracking branch 'upstream/master'
- about us files