ממים עם שרת
Merge branch 'master' of https://github.com/DavidSalzer/activistsForISraelNew

Conflicts:
	socialGroupApp.js
Merge branch 'master' of https://github.com/DavidSalzer/activistsForISraelNew