Commit local changes in the office
Merge branch 'master' of github.com:xuedoris/yii-phonebook

Conflicts:
	protected/models/People.php
	protected/views/phonebook/index.php