merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	src/communities/locale/he/LC_MESSAGES/django.mo
	src/communities/locale/he/LC_MESSAGES/django.po
	src/issues/templates/issues/issue_detail.html
	src/issues/templates/issues/proposal_detail.html
	src/meetings/templates/meetings/meeting_detail.html
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/templates/issues/proposal_detail.html
	src/meetings/templates/meetings/meeting_detail.html
	src/ocd/settings.py
work in progress. moving to floppyforms.
Merge pull request #3 from nonZero/yaniv_bootstrap3

work in progress. moving to floppyforms.
More work on bootstrap 3.
Playing with pagemenu buttons in bootstrap
remove pagemenu from community list template
More bootstrap and crispy forms removal
BS3, fixed issues.js, included navbar.html
Bootstrap & Trello issues
Minor style repairs
Added font awesome.
Fixed search in issue list.
Messing up things with wysihtml5. Udi to the rescue?
Fixed buttons in forms (text)
Fixed error with proposal cancel button (match code with Amir)
Started playing with piechart in Issue detail page
WYSIHTML5 instead of Tinymce (still buggy)
Some css & translations
Merge branch 'master' into bootstrap3_merge

Conflicts:
	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/emails/_protocol.html
	src/communities/templates/emails/agenda.html
	src/fabfile.py
	src/issues/forms.py
	src/issues/locale/he/LC_MESSAGES/django.mo
	src/issues/locale/he/LC_MESSAGES/django.po
	src/issues/models.py
	src/issues/static/js/proposal.js
	src/issues/templates/issues/_comment.html
	src/issues/templates/issues/_proposal.html
	src/issues/templates/issues/issue_detail.html
	src/issues/templates/issues/proposal_detail.html
	src/meetings/locale/he/LC_MESSAGES/django.mo
	src/meetings/locale/he/LC_MESSAGES/django.po
	src/meetings/models.py
	src/meetings/templates/meetings/meeting_detail.html
	src/ocd/static/js/forms.js
fixed wysihtml5 init
Merge remote-tracking branch 'amir/master'

Conflicts:
	src/issues/templates/issues/issue_detail.html