AreaShop v2.0.0

Merge changes from 2.0.0 to master