sync folders
Merge https://github.com/omeriko9/zohargallery

Conflicts:
	scripts/Elastislide/css/elastislide.css