remove free time & enter public room in header bar
Merge branch 'master' of https://github.com/qqfish/haijiao

Conflicts:
	src/java/com/haijiao/Domain/bean/User.java