merge cate-development2 branch with trunk