[wip] popup.js
Merge branch 'master' of github.com:odom/yiitemplatetest

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