clear
Merge branch 'master' of https://github.com/MrSaxon/tzy

Conflicts:
	protected/config/main.php