useless dependency
Issue92 showing candidates that answered each question
Merge branch 'master' of https://github.com/hasadna/ok-qa

Conflicts:
	locale/he/LC_MESSAGES/django.mo
	locale/he/LC_MESSAGES/django.po
Merge
edit questions ticket #32
edit questions ticket #32, typo in .po
merge, fixing #32
improving search
Merge pull request #98 from ozomer/master

Issue #92 is done - showing pictures of candidates that answered each question.
Issue #68 Allow an author to delete his question
Merge branch 'master' of https://github.com/hasadna/ok-qa

Conflicts:
	qa/templates/qa/question_detail.html
renaming the projet to oshot
Merge branch 'master' of https://github.com/ozomer/ok-qa into oshot
update readme