updating comboKeyValue function
adding solr4 string
Merge branch 'master' into combo_update

Conflicts:
	extensions/adapter/data/QueryStringBuilder.php
Merge pull request #37 from mdx-dev/combo_update

updating comboKeyValue function