cacheditems map
Merge branch 'cacheditems' of https://github.com/StefanoSalsano/my-floodlight into cacheditems
Merge branch 'icofi' into cacheditems