Merge branch 'devel' of github.com:bjandras/Objavi into devel
Merge branch 'devel' into bookjs