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

Conflicts:
	index.php
	js/settingsController.js
edit group
Merge branch 'master' of https://github.com/daniel-cambium/bookso
edit
Merge branch 'master' of https://github.com/daniel-cambium/bookso
update user