Merged Aya's and Binh's Extractor\Settings code. Kept the @override in MBeanData.java, put BeanData.java back into folder, and left Binh's Attribute.java the same.
Fixed errors that arose from not checking the merged code.
Merge pull request #2 from gshawn/master

Merge Aya and Binh