merge cate-development2 branch with trunk
licence comment added
Corrected and added to tests
make cache generator work