commit for merging
Merge branch 'master' of github.com:yupe/yupe

Conflicts:
	protected/modules/user/messages/ru/user.php
fix process of migration to nestedsets comments
fix process of migration to nestedsets comments
Merge branch 'master' of https://github.com/yupe/yupe
themefix
small fix