yii user .Contact Done
test 2
Merge branch 'master' of https://github.com/deltabeta/APL

Conflicts:
	protected/views/user/