chengwenliang/nshop @ dev

llp 3334667ad4 Merge branch 'llp_member_26_04_16' into dev		17 godzin temu
..
Longyi	3334667ad4 Merge branch 'llp_member_26_04_16' into dev	17 godzin temu
Webkul	3334667ad4 Merge branch 'llp_member_26_04_16' into dev	17 godzin temu