[task] list contact
Merge branch 'master' of github.com:odom/yiitemplatetest

Conflicts:
	public_html/js/home/listContact.js