git push origin developMerge branch 'grandoc-develop' into develop

htdocs/accountancy/admin/accountmodel.php

htdocs/accountancy/admin/categories.php

htdocs/accountancy/admin/categories_list.php

htdocs/accountancy/admin/defaultaccounts.php

htdocs/accountancy/admin/export.php

htdocs/accountancy/admin/fiscalyear.php

htdocs/accountancy/admin/importaccounts.php

htdocs/accountancy/admin/index.php

htdocs/accountancy/admin/journal.php

htdocs/accountancy/admin/journals.php

htdocs/modulebuilder/skeletons/skeleton_list.php