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?
added model fields to support votes. fixed bugs in Amit school pilot.
replaced file icons with new set. added file attachment links to meeting summary and draft.
file icons
translation for 'related files' in meeting protocol. assert for removal of changed issue during a meeting.
changed _protocol.html to include absolute urls to file attachments, and inserted inline file-icons.
added absolute path to file icons