ש
Merge branch 'master' of https://github.com/DavidSalzer/activistsForISraelNew

Conflicts:
	components/event/event.css
	components/event/event.js