change main layout file -test
change main layout file -feature
change main layout file -feature
modify index
add framework
begin work for new website
begin work for new website
modify some bootstrap extension
make menu
i18n
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/YiiBase.php
	framework/web/widgets/CWidget.php
	framework/yiilite.php
	protected/config/main.php
	protected/views/layouts/main.php
	protected/views/site/index.php