Merge pull request #7 from thaodtp/master

aa
Display Lab Room, Server Room
Merge origin/master

Conflicts:
	src/java/ui/LabUI.java
Merge pull request #9 from thaodtp/master

aa
Resource
Merge pull request #15 from a05169/master

a