search works
merged
Merge remote-tracking branch 'origin/master'
my work
Merge branch 'master' into robson

Conflicts:
	Genetec.MI6/Genetec.MI6.xcodeproj/project.pbxproj
added note population.