Merge branch 'master' of https://github.com/carlottanegri/radiopop-firefoxOS
Merge branch 'master' of https://github.com/carlottanegri/radiopop-firefoxOS
minor changes