Migrating to use JSON for data storage
Merge branch '2013' of https://github.com/Nauplius/WAS.git