Django version updated to 1.5
New style for url tags applied on templates
Merge branch 'feature/django-1.5' into develop
Merge branch 'develop'