gg
git
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	json/index.php
Merge branch 'master' of https://github.com/daniel-cambium/bookso
איתחול אזור הגדרות + נויגציה
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	index.php