Merge branch 'master' of https://github.com/hasadna/Open-Knesset
Merge branch 'master' of https://github.com/hasadna/Open-Knesset
fix some errors when trying to start a new environment:

1. company firewall didn't let me get git:// links so I change to http
2. some migrations failed when doing a new db, i commented out the problematic places
download stage of plenum protocols:

./manage.py parse_plenum_protocols --download
downloads the protocol files to data directory
TODO: parse the files, then update db
download protocols  6 months back
parse using antiword into docbook xml
finalizing the download and parse plenum protocols actions
also adding an html-preview plenum option for previewing the parsed data in a user-friendly html form
Merge branch 'master' of https://github.com/hasadna/Open-Knesset
Merge branch 'master' of https://github.com/hasadna/Open-Knesset
adding plenum url
Merge branch 'master' of https://github.com/hasadna/Open-Knesset
add plenum committee to normal committee tables/models
make the committee view ignore the plenum meetting
modify the parse_plenum_protocols command to save to committee models
finishing touches for plenum
committing django.mo
Merge branch 'master' of https://github.com/hasadna/Open-Knesset

Conflicts:
	locale/he/LC_MESSAGES/django.mo
	locale/he/LC_MESSAGES/django.po
	templates/base.html
	templates/committees/committeemeeting_detail.html
	templates/committees/committeemeeting_list.html
cleaning up
finally, we have plenum!
make the plenum highlighted in main menu
PR 65: Merge branch 'master' of https://github.com/astupidog/Open-Knesset
Fix tests for PR 65
Style changes should be in less files