Upgrading to django 1.5.5
Version bump
Merge branch 'release/0.0.46' into develop