refs #5118
    * Most of objects (traps, timeperiods and pollers are missing) are now list with th new format.
    * Monitoring listing to adapt
Merge branch 'master' of http://git.centreon.com/centreon

Conflicts:
	core/views/tools/datatableJs.tpl