[#1511]Some formatting edited
[#1511]Some formatting
Merge pull request #4 from gruber86/bug_1511

Bug 1511
[#1522]XML
merge
[#1522]User avatar
[#1522]Pictures ok
[#1522]Almost done
[#1522]Done for review
[#1522]Done for review but after pep8 ect