local change
Merge remote-tracking branch 'origin'

Conflicts:
	protected/config/main.php
	protected/controllers/testController.php
	protected/runtime/application.log