Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing

htdocs/admin/notification.php

htdocs/admin/websites.php

htdocs/bookmarks/bookmarks.lib.php

htdocs/comm/action/index.php

htdocs/comm/action/listactions.php

htdocs/contact/card.php

htdocs/core/actions_setmoduleoptions.inc.php

htdocs/core/class/menubase.class.php

htdocs/install/mysql/migration/5.0.0-6.0.0.sql

htdocs/install/mysql/migration/repair.sql

htdocs/install/mysql/tables/llx_website_page.key.sql

htdocs/install/mysql/tables/llx_website_page.sql

htdocs/install/step1.php

htdocs/langs/en_US/modulebuilder.lang

htdocs/langs/en_US/website.lang

htdocs/main.inc.php

htdocs/modulebuilder/index.php

htdocs/modulebuilder/template/class/myobject.class.php

...modulebuilder/template/core/modules/modMyModule.class.php

htdocs/modulebuilder/template/myobject_list.php