analyze part and connect each part
refactor
ui improve
Merge remote-tracking branch 'origin/master'
03-21-16:55
test
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/storeworld/pub/service/DeliverInfoService.java
Update Stock.java
Update Stock.java
test push
data - ui