Merge branch 'release/0.9.6'
Merge branch 'release/0.9.7'
Fix #153: in question detail page, display the list of question supporters
Merge branch 'show-supporters' of https://github.com/danielhers/open-shot into daniel-dev
version
Merge branch 'release/0.9.8' into dev
Merge branch 'master' of github.com:hasadna/ok-qa into dev
Fix #153: in question detail page, display the list of question supporters
Merge branch 'show-supporters' of https://github.com/danielhers/open-shot into daniel-dev

Conflicts:
	qa/templates/qa/question_detail.html
	qa/views.py
	static/css/style.css
Merge branch 'daniel-dev' into dev