old changes
Merge branch 'master' of github.com:liongen/svitamin

Conflicts:
	www/protected/config/main.php
finish stage!!!