commiting to pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	RoomLife/war/WEB-INF/showBuilding.jsp