AreaShop v1.1

Update master to the code of AreaShop V1.1