22.1
Merge branch 'master' of https://github.com/DavidSalzer/activistsForIsraelNew
Merge branch 'master' of https://github.com/DavidSalzer/activistsForIsraelNew
23
event feed
Merge branch 'master' of https://github.com/DavidSalzer/activistsForIsraelNew

Conflicts:
	components/event/event.js