Added filter for current instrument in country nfp list
Merge branch 'master' of github.com:eaudeweb/cms.contacts