Security methods
Utils to find objects within zodb
Search prototype
Merge branch 'master' of github.com:FikaProject/fika

Conflicts:
	fika/templates/master.pt