base
search with block
Merge commit '23c9fa4f0f152b5aa20cd1d241524eb65fb70e5a'

Conflicts:
	IntellectT9/IntellectKeyboardT9/BaseManager/BaseManager.h