Merging Initial yii installation with features done so far