Merge remote-tracking branch 'yaniv/master'
sprint 6 fixes
hide deleted issue from historic meeting
Merge remote-tracking branch 'yaniv/master'

Conflicts:
	src/issues/templates/issues/issue_detail.html
revert change in tabs display condition
changed response handling of issue complete/undo-complete actions
added dummy text for testing remote branch
cleanup
minor fix to add/remove invitation
quick & dirty: allow superuser to import invitation list from csv file
fix proposal task form to handle the case of two users with identical names
added Hebrew encoding handling to user invitations file import
after issue-undo-complete button clicked - reload issue page into the default tab
changes to database per sprint #7 spec
implemented registration of absent board members
change meeting participants count to match new table field
Merge remote-tracking branch 'yaniv/sprint7'

Conflicts:
	src/issues/templates/issues/issue_detail.html
fixed a bug in proposalVoteView
Added ocd.show event, to redraw app after showing it with js.
Merge remote-tracking branch 'amir/release_sprint_5' into feature/tabs-history
Merge remote-tracking branch 'amir/master'

Conflicts:
	src/issues/templates/issues/proposal_detail.html
	src/ocd/static/js/filter.js
added fab switch command, for switching branches.

Usage: fab prod switch:realease_6