m
Merge branch 'master' of github.com:lcjiao/haidao

Conflicts:
	island_back/src/main/webapp/WEB-INF/weddingphoto/wdppackage/wdppackage_list.jsp