Merge pull request #56 from prakashpp/develop

Allow editing of xml created articles
Add rst templates for articles in webshop #4611
Merge pull request #57 from sharoonthomas/develop

Add rst templates for articles in webshop #4611
Fabfile for webshop demo server
Release version 3.0.2.0
Merge branch 'release/3.0.2.0' into develop
Merge pull request #58 from prakashpp/feature/task-4607

Fabfile for webshop demo server
Fabfile: notify hipchat removed
Merge pull request #59 from prakashpp/feature/task-4607

Fabfile: notify hipchat removed
Implemented remove/hide address #4622
Merge pull request #60 from goyal1092/feature/task-4622

Implemented remove/hide address #4622
Load external content on https #4665
Added logo and favicon #4619

Added docs to update favicon
Merge pull request #62 from tarunbhardwaj/task-4619

Added logo and favicon #4619
Merge pull request #61 from tarunbhardwaj/develop

Load external content on https #4665
Release version 3.0.2.1
Merge branch 'release/3.0.2.1' into develop
Added new landscape mode logo with text #4619
Merge pull request #63 from tarunbhardwaj/task-4619

Added new landscape mode logo with text #4619
Improving email templates.

Adding some {% trans %} tags needed by jinja.