Bootstrap + New layout

view/layout/main
protected/extension/bootstrap
bootstrap: yii-bootstrap-2.1.0.r355
Bootstrap + New layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
	protected/views/layouts/main.php