merge cate-development2 branch with trunk
minimum base web services for CDM Portal v2.0
svn keyword property "Id" added
Geoservice preliminary colors
EDIT GeoService update