[add] panel right
Merge branch 'master' of github.com:odom/yiitemplatetest

Conflicts:
	myapp/css/homepage.css
	myapp/protected/views/layouts/homepage_layout.php