[Already] create popUp dialog "create new room"
Merge branch 'master' of github.com:odom/yiitemplatetest

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