Merge Aya and Binh

Merged Aya's Settings file, left Attributes the same, kept the @overrides in MBeanData, and "put back" BeanData.java