local changes to config
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
fixed config to make yiistrap work, updated bootstrap theme