Merge remote-tracking branch 'Upstream/develop' into develop-html5

.tx/config

ChangeLog

build/doxygen/doxygen_footer.html

build/doxygen/doxygen_header.html

dev/skeletons/skeleton_page.php

dev/test/testdiv.php

htdocs/accountancy/admin/card.php

htdocs/accountancy/admin/fiscalyear_card.php

htdocs/accountancy/customer/card.php

htdocs/adherents/admin/public.php

htdocs/adherents/card.php

htdocs/adherents/card_subscriptions.php

htdocs/adherents/type.php

htdocs/admin/agenda.php

htdocs/admin/agenda_extsites.php

htdocs/admin/agenda_other.php

htdocs/admin/agenda_xcal.php

htdocs/admin/clicktodial.php

htdocs/admin/company.php

htdocs/admin/delais.php