Display bug for student inbox fixed
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of heroku.com:drona

Conflicts:
	app/assets/javascripts/students/response.js.coffee