release
Merge branch 'master' of github.com:Ozerich/taxon-api

Conflicts:
	db.sql
	protected/controllers/ApiController.php
	protected/controllers/SiteController.php
	protected/models/Driver.php