Merge branch 'master' of https://github.com/ms8/ms8

Conflicts:
	protected/views/prepare/interview.php
登录 注册
Merge remote-tracking branch 'origin/master'