search strategy option
Merge branch 'dev-options' into dev

Conflicts:
	OpenIAB
	unity_plugin/unity_src/Assets/Plugins/Android/OpenIAB-plugin.jar