Created Audio class
Merge branch 'master' into Oskar
fixed music stuff
generated javadoc