some fix
Merge branch 'yii' of https://github.com/dstreamline/quest into yii

Conflicts:
	.gitignore