New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	wedTravel/src/main/java/com/wt/action/AreaAction.java
shilei 5-17