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

Conflicts:
	services/generalParameters.js
	socialGroupApp.js