merging commit.
Merge branch 'master' of github.com:idpocky/My-prj-Jc

Conflicts:
	.gitignore

	protected/extensions/bootstrap/0.9.10.r160.txt
	protected/extensions/bootstrap/assets/css/bootstrap-responsive.css
	protected/extensions/bootstrap/assets/css/bootstrap-responsive.min.css
	protected/extensions/bootstrap/assets/css/bootstrap.css
	protected/extensions/bootstrap/assets/css/bootstrap.min.css
	protected/extensions/bootstrap/assets/js/bootstrap-alert.js
	protected/extensions/bootstrap/assets/js/bootstrap-button.js
	protected/extensions/bootstrap/assets/js/bootstrap-carousel.js
	protected/extensions/bootstrap/assets/js/bootstrap-collapse.js
	protected/extensions/bootstrap/assets/js/bootstrap-dropdown.js
	protected/extensions/bootstrap/assets/js/bootstrap-modal.js
	protected/extensions/bootstrap/assets/js/bootstrap-popover.js
	protected/extensions/bootstrap/assets/js/bootstrap-scrollspy.js
	protected/extensions/bootstrap/assets/js/bootstrap-tab.js
	protected/extensions/bootstrap/assets/js/bootstrap-tooltip.js
	protected/extensions/bootstrap/assets/js/bootstrap-transition.js
	protected/extensions/bootstrap/assets/js/bootstrap-typeahead.js
	protected/extensions/bootstrap/components/Bootstrap.php
	protected/extensions/bootstrap/gii/bootstrap/BootstrapGenerator.php
	protected/extensions/bootstrap/lib/bootstrap/js/README.md
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-alert.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-button.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-carousel.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-collapse.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-dropdown.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-modal.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-popover.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-scrollspy.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-tab.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-tooltip.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-transition.js
	protected/extensions/bootstrap/lib/bootstrap/js/bootstrap-typeahead.js
	protected/extensions/bootstrap/lib/bootstrap/js/tests/unit/bootstrap-button.js
	protected/extensions/bootstrap/lib/bootstrap/js/tests/unit/bootstrap-typeahead.js
	protected/extensions/bootstrap/lib/bootstrap/less/alerts.less
	protected/extensions/bootstrap/lib/bootstrap/less/bootstrap.less
	protected/extensions/bootstrap/lib/bootstrap/less/breadcrumbs.less
	protected/extensions/bootstrap/lib/bootstrap/less/button-groups.less
	protected/extensions/bootstrap/lib/bootstrap/less/buttons.less
	protected/extensions/bootstrap/lib/bootstrap/less/code.less
	protected/extensions/bootstrap/lib/bootstrap/less/component-animations.less
	protected/extensions/bootstrap/lib/bootstrap/less/dropdowns.less
	protected/extensions/bootstrap/lib/bootstrap/less/forms.less
	protected/extensions/bootstrap/lib/bootstrap/less/grid.less
	protected/extensions/bootstrap/lib/bootstrap/less/hero-unit.less
	protected/extensions/bootstrap/lib/bootstrap/less/labels.less
	protected/extensions/bootstrap/lib/bootstrap/less/mixins.less
	protected/extensions/bootstrap/lib/bootstrap/less/modals.less
	protected/extensions/bootstrap/lib/bootstrap/less/navbar.less
	protected/extensions/bootstrap/lib/bootstrap/less/navs.less
	protected/extensions/bootstrap/lib/bootstrap/less/pager.less
	protected/extensions/bootstrap/lib/bootstrap/less/pagination.less
	protected/extensions/bootstrap/lib/bootstrap/less/progress-bars.less
	protected/extensions/bootstrap/lib/bootstrap/less/reset.less
	protected/extensions/bootstrap/lib/bootstrap/less/responsive.less
	protected/extensions/bootstrap/lib/bootstrap/less/scaffolding.less
	protected/extensions/bootstrap/lib/bootstrap/less/sprites.less
	protected/extensions/bootstrap/lib/bootstrap/less/tables.less
	protected/extensions/bootstrap/lib/bootstrap/less/type.less
	protected/extensions/bootstrap/lib/bootstrap/less/variables.less
	protected/extensions/bootstrap/lib/bootstrap/less/wells.less
	protected/extensions/bootstrap/widgets/BootActiveForm.php
	protected/extensions/bootstrap/widgets/BootButtonColumn.php
	protected/extensions/bootstrap/widgets/BootDetailView.php
	protected/extensions/bootstrap/widgets/BootListView.php
	protected/extensions/bootstrap/widgets/BootMenu.php
	protected/extensions/bootstrap/widgets/BootModal.php
	protected/extensions/bootstrap/widgets/BootNavbar.php
	protected/extensions/bootstrap/widgets/input/BootInput.php
	protected/extensions/bootstrap/widgets/input/BootInputHorizontal.php
	protected/extensions/bootstrap/widgets/input/BootInputVertical.php
	protected/views/layouts/main.php