DJBP-11 | upgrade to latest django 1.5.x: 1.5.4
Merge remote-tracking branch 'hoatle/tasks/11_upgrade_latest_django_1.5.x' into develop