Hospital.xml
Hospital.java
update
update
Merge branch 'master' of github.com:mooing/wss

Conflicts:
	src/main/webapp/WEB-INF/views/common/head.html
	target/m2e-wtp/web-resources/META-INF/maven/com.mooing.wss/wss/pom.properties