search algorithm
Merge branch 'master' of https://github.com/Ozerich/taxon-api

Conflicts:
	db.sql
	protected/controllers/ApiController.php
	protected/controllers/SiteController.php
	protected/views/admin/index.php