merging with next colivre branch
Removed whitespaces

Also allowing the expire of cache from old layouts
Fixed tests