Fixed bug in sorting which discards the keys for instruments filtering
Moved field_country_instrument to field_instrument
refs #1965 - Added chosen to the widget
Merge branch 'master' of https://github.com/cristiroma/cms.country into cristiroma-master

Conflicts:
	cms_country.info