chengwenliang/nshop @ dev

llp 3334667ad4 Merge branch 'llp_member_26_04_16' into dev		há 17 horas atrás
..
Longyi	3334667ad4 Merge branch 'llp_member_26_04_16' into dev	há 17 horas atrás
Webkul	3334667ad4 Merge branch 'llp_member_26_04_16' into dev	há 17 horas atrás