Merge pull request #18 from santifinland/develop

Develop
Merge pull request #20 from santifinland/develop

Develop
Merge pull request #22 from santifinland/develop

Develop
Merge pull request #24 from santifinland/develop

Develop
Merge pull request #26 from santifinland/develop

Develop
Merge pull request #28 from santifinland/develop

Develop
Merge pull request #30 from santifinland/develop

Develop
Merge pull request #32 from santifinland/develop

Develop
Merge pull request #34 from santifinland/develop

Develop
Merge pull request #36 from santifinland/develop

Develop
Merge pull request #38 from santifinland/develop

Develop
collecstatic
fix image load by https://github.com/jezdez/django-avatar/pull/92/files
fix image load by https://github.com/jezdez/django-avatar/pull/92/files
Fix merge!
Merge pull request #39 from santifinland/feature/amazons3

fix image load by https://github.com/jezdez/django-avatar/pull/92/files