[WIP] Create new room pop UP
Merge branch 'master' of github.com:odom/yiitemplatetest
[WIP] pop up dralog box
Merge branch 'master' of github.com:odom/yiitemplatetest

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