updated django to 1.5.5
Merge branch 'django15' of github.com:iterativ/iteration into django15