Signed-off-by: yangjun <Administrator@192.168.244.128>
Merge branch 'master' of https://github.com/sgewuhan/pm.git

Conflicts:
	com.sg.business.work/plugin.xml
	com.sg.business.work/src/com/sg/business/work/home/link/DeliveryLinkAdapter.java