Merging fix
Cleaning and merging
Upower new module
Changed function return value
List upower devices