Including YiiBooster in dependencies
Using YiiBooster instead of YiiBootstrap
Added the bootstrap generator
X-Editable for Yii 1.2.0
Merge branch 'master' of https://github.com/phundament/app into include-yiibooster

Conflicts:
	app/config/main.php
Necessary config changes for current YiiBooster to work
Updated composer.lock
Merge commit '123e44596e5bffa3bdbfac94b93bb6055ee3ccef' into yiibooster
Merge commit 'f73cc39a00a842dd7733a1701559f1ae2e9c7db0' into yiibooster

Conflicts:
	composer.lock
updated deps
updated deps
fixed typo
fixed yiibooster naming
updated dev versions to next release
added bootstrap widgets to imports
updated deps to use yii-booster
Merge branch 'master' into yiibooster

Conflicts:
	composer.lock