Merge remote-tracking branch 'origin/his/csxy3' into his/csxy3

# Conflicts:
#	src/main/java/com/diagbot/facade/QcClientFacade.java
#	src/main/java/com/diagbot/facade/ViewFacade.java
#	src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java
#	src/main/java/com/diagbot/web/DataController.java