starw voting
changed field 'value' in issues_ProposalVote from PositiveIntegerField to SmallIntegerField
Merge remote-tracking branch 'hasadna/master'
Added nicer admin screens for issues app
summation of straw votes
Merged changes from Amir.
Added working piechart.
Fixed some Trello issues.
Changes start/undo upcoming meeting form submission.
Merge remote-tracking branch 'upstream/production'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/ocd/templates/base.html
Merge
Merge branch 'master' of https://github.com/amir99/OpenCommunity

Conflicts:
	src/communities/forms.py
	src/communities/locale/he/LC_MESSAGES/django.mo
	src/communities/locale/he/LC_MESSAGES/django.po
	src/communities/models.py
	src/communities/templates/communities/_issue.html
	src/communities/templates/communities/upcoming.html
	src/communities/templates/communities/upcoming_form.html
	src/issues/locale/he/LC_MESSAGES/django.mo
	src/issues/locale/he/LC_MESSAGES/django.po
	src/issues/models.py
	src/issues/static/js/_piechart.js
	src/issues/static/js/proposal.js
	src/issues/templates/issues/_proposal_vote_results.html
	src/issues/templates/issues/_vote_panel.html
	src/issues/templates/issues/_vote_reset_panel.html
	src/issues/templates/issues/issue_detail.html
	src/issues/templates/issues/proposal_detail.html
	src/issues/templatetags/voting_tags.py
	src/issues/views.py
	src/meetings/locale/he/LC_MESSAGES/django.po
fixes to previous commit, added methods for vote summation
Merge branch 'master' of https://github.com/amir99/OpenCommunity
Merge with amir on voting model.
Tiny css repair.
Fix some broken merge with Amir
Fixed missing icon in proposal list.
Fixed voting graph for issue page & proposal page.
Bunch of css repairs.
Few trello issues.
Translations.
New cancel edit comment button location (per trello).
Commiting to solve an issue that I don't have localy
added the missing functions from Amir
Fix it as per my style
show vote results as pie-chart and text