DJHBP-24 | upgrade to the latest version of django (1.5.4): workaround for devpi bug on jenkins build
Merge remote-tracking branch 'hoatle/tasks/24_upgrade_django_1.5.4' into develop