Some Improvements for ChoiseMediator
Merge branch '1.6.x' of https://github.com/geosdi/geo-platform into 1.6.x