All new changes will go into 0.4 release
Merge branch 'master' into develop
Merge pull request #194 from python/hotfix/django-148

Upgrade Django to 1.4.8
Refs #195 - Version bumped Django to 1.4.11 for security fixes
Merge pull request #196 from python/fix/django-security

Version bumped Django to 1.4.11 for security fixes
Added details about version 0.4 to changelog
Merge branch 'develop'