Merge pull request #29 from matthis-d/master

Changes in JSON responses
Merge remote-tracking branch 'upstream/master'
Issue #27 : mail with resources / mail in HTML format