Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

.travis.yml

build/debian/apache/.htaccess

build/exe/doliwamp/httpd.conf.install

dev/fixdosfiles.sh

htdocs/accountancy/admin/fiscalyear.php

htdocs/adherents/class/adherent.class.php

htdocs/adherents/cotisations.php

htdocs/admin/system/filecheck.php

htdocs/comm/action/card.php

htdocs/comm/action/class/actioncomm.class.php

htdocs/comm/action/index.php

htdocs/comm/action/listactions.php

htdocs/comm/action/pertype.php

htdocs/comm/action/peruser.php

htdocs/comm/index.php

htdocs/comm/mailing/cibles.php

htdocs/comm/mailing/index.php

htdocs/comm/propal/list.php

htdocs/comm/propal/stats/index.php

htdocs/commande/card.php