added missing getter and setter methods and jsonignore for the time being
merged changes