removed upnp from ehmi
Added a composite and a android distribution specific to be without devices