Basic music support added, multiple bugfixes
Merge branch 'robin'