auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	protected/config/db.php
	protected/config/main.php
	protected/controllers/DriverController.php
	protected/controllers/SiteController.php
	protected/extensions/YiiFirebird/CFirebirdColumnSchema.php
	protected/models/LoginForm.php
	protected/views/driver/index.php
	protected/views/site/index.php