Merge branch 'master' into development
Added search functionality

Simple search functionally added
Updated build version info
Merge branch 'development'

Conflicts:
	CHANGES.txt
	setup.py