Added changes for Yii framework See
http://www.yiiframework.com/wiki/307/startin-your-yii-project-reference-guide-with-git-vcs-in-linux/#hh6
Merge remote-tracking branch 'origin/master' into pr/506

Conflicts:
	Yii.gitignore
Merge pull request #506