Add local changes
Merge branch 'master' of github.com:xuedoris/yii-phonebook

Conflicts:
	protected/controllers/PhonebookController.php
	protected/models/Phoneowner.php
	protected/views/phonebook/addnew.php