עמוד אודות בעמוד הבית
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/navigationController.js
Merge branch 'master' of https://github.com/daniel-cambium/bookso
הגדרות
Merge branch 'master' of https://github.com/daniel-cambium/bookso