modified readme
Fixed translations
fixed translations and upload
Some final refactoring
Fixing merge conflicts
Fixed merge conflicts
Merge pull request #114 from yapapaya/master

Fixed merge conflicts