NRJdroid gogo
resolve conflicts
Merge branch 'master' of https://github.com/jonasoesch/NRJ