Merge remote-tracking branch 'origin/master'

assets/css/aap/aap.css

assets/css/coInput/co-input.css

assets/css/filters.css

assets/js/aap/aap.js

assets/js/aap/aapv2.js

assets/js/admin/admin_directory.js

assets/js/admin/panel.js

assets/js/cd_refresh_automation.js

assets/js/co.js

assets/js/coInput/co-input-types-css.js

assets/js/coInput/co-input.js

assets/js/dataHelpers.js

assets/js/default/aacgenerique.js

assets/js/default/directory.js

assets/js/default/discussionSocket.js

assets/js/default/filters.js

assets/js/default/profilSocial.js

assets/js/default/socket-connection.js

assets/js/links.js

assets/json/Hackaton/Batiments.geojson