first
Merge branch 'master' of https://github.com/andrew2net/abctoy

Conflicts:
	index.php
	protected/config/console.php
	protected/config/main.php