Adding Note and Tone Generator classes.
Merge with changes from the Server