Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 7:
    - creation of empty classes.

Change-Id: I78101bc0201162b657265d751f8b29625de6afe9
Fix TONE typo