ui update
Merge remote-tracking branch 'origin/meeting' into develop
update
append
reset head ~
Merge branch 'develop' into account

Conflicts:
	src/qbook/view/meeting/AssembleRoomPolicyActivity.java
modified:   src/qbook/view/meeting/AssembleRoomPolicyActivity.java#
Merge remote-tracking branch 'origin/account' into account