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'
Mofed the users models to a new app: Users
New created_at and updated_at fields for the base model
Included a dumpdata script
Now the update method also updates the updated_at date
Updated the quickstart for heroku install with the procfile
Merge branch 'master' of github.com:magnet-cl/django-project-template into development

Conflicts:
	config/settings.py