fix bugs
Merge branch 'master' of https://github.com/liliansun/qionghua

Conflicts:
	app/views/room/greeting.blade.php
	app/views/room/room_description.blade.php