Update the eggs
Ignore warnings
Use new correct favicon location
Merge branch 'feature/django-1.7' into develop
Bumping to version 0.4
Merge branch 'release/v0.4' into develop
Merge branch 'develop' of github.com:Fantomas42/zinnia-theme-bootstrap into develop