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

Conflicts:
	protected/modules/user/messages/ru/user.php