color picker pallete
Merge branch 'master' of https://github.com/DavidSalzer/activistsForISraelNew

Conflicts:
	components/meme/meme.css
	components/meme/write-meme.js
	components/poll/pollView.js
	components/user/signin.html
	components/user/signin.js
	index.html
	services/generalParameters.js