Merge pull request #196 from johngian/fix-travis

Fix travis errors regarding peep

Merge pull request #189 from comzeradd/fix-guide-url

Fix education guide url

Merge pull request #187 from johngian/fix-unicode-user

Use mozillians_username for unicode representation.

Merge pull request #162 from johngian/fix-photo-form

Make image form field required.

Merge pull request #160 from comzeradd/unify

[Fixes #147] Unify all actions to detail view

Merge pull request #149 from comzeradd/media

Add new activity for uploading images

Merge pull request #137 from akatsoulas/emails-export

Add user's email in contributions export.

Merge pull request #137 from akatsoulas/emails-export

Add user's email in contributions export.

Merge pull request #123 from comzeradd/ui-fixes

Ui fixes

Merge pull request #122 from akatsoulas/upgrade-django

Upgrade django to version 1.7.7