Fixed cql window size
Merge branch 'master' of git://github.com/geosdi/geo-platform
Fix a NPE exception
Merge branch 'master' of github.com:geosdi/geo-platform