Merge branch 'master' of C:\WebServers\home\yii.ww\www with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
add changes