edit contact
Merge branch 'master' of https://github.com/rnacken/yii_test

Conflicts:
	protected/views/site/contact.php