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

Conflicts:
	protected/runtime/application.log
slider bug
bug slider
Slider Bug