- Items on https://github.com/abhinavc/web-application/issues/85
  rectified. Mostly pertaining to the QuickTrial dialogs.
- QuickTrial in keeping with the font-style elsewhere
Merge remote-tracking branch 'upstream/master'
- typo
Merge branch 'master' of heroku.com:drona

Conflicts:
	app/assets/javascripts/teachers/trigger.js.coffee