4.1.0

Start a new branch for misc featuers for future stuff. Base on 4.0 but might be more advanced stuff (Upnp goes here).