More piechart
Some css
fixed issue_detail.html merge problems
Merge branch 'master' of https://github.com/nonZero/OpenCommunity

Conflicts:
	src/communities/locale/he/LC_MESSAGES/django.mo
	src/communities/locale/he/LC_MESSAGES/django.po
	src/issues/locale/he/LC_MESSAGES/django.po
	src/issues/models.py
	src/issues/templates/issues/issue_detail.html
	src/meetings/locale/he/LC_MESSAGES/django.mo
	src/meetings/locale/he/LC_MESSAGES/django.po
	src/ocd/templates/base.html
	src/ocd/templates/dialog.html
	src/users/locale/he/LC_MESSAGES/django.mo
	src/users/locale/he/LC_MESSAGES/django.po
Merge branch 'master' of https://github.com/nonZero/OpenCommunity
Some trello issues repairs
More bootstrap trello issues
added tests for invitations
added accept invitation tests
Merge pull request #4 from Illniyar/master

added tests for invitations
Added nicer admin screens for issues app
Trying to fix chorme on iOS modal bug
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
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.