Added eclipse stuff, updated to list devices
Fixed error during merge