- display ongoing suggestions
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
- wiring for FAQ/About Us section
Minor text edits
- more text edits
Merge branch 'master' of https://github.com/adamarla/web-application into adamarla-master

Conflicts:
	app/controllers/examiners_controller.rb