Combine this fork with airsonic-advanced

[randomnicode]

Scope

Other

request

I'd like to merge the two forks and hopefully hand over maintenance of the original fork airsonic-advanced so there's one place for all of it

[kagemomiji]

@randomnicode

I'm very positive about integrating the forks and taking over the maintenance of the original airsonic-advanced, so we can all move forward together in one place.
However, I am concerned about how to merge the content that has significantly diverged over more than a year. Do you have any thoughts on how we might approach this?