Merge pull request #83 from sharoonthomas/develop

Merge trytond_nereid into nereid