minor changes
Merge remote-tracking branch 'upstream/master'
changes on project rules
Merge pull request #60 from calonso-conabio/master

minor translations