fix build
Merge branch 'master' of github.com:rhomobile/rhoconnect-client

Conflicts:
	ext/rhoconnect-client/ext/rhoconnect-client/platform/wm/Rhoconnect-client.vcproj
backward compatibility for search