merge image add to shared and connection status lable
Merge branch 'master' of https://github.com/yvanscher/mahlamute
blah