Fixed an issue on reload in Infinite Data Source
Merge branch '2.0' of https://github.com/xebia-france/XBToolkit into 2.0