Added locale fr and ro for devise
Merge branch 'master' of https://github.com/samtreweek/candy_rock