First commit
Merge branch 'master' of https://github.com/ivan7707/GeoDjangoTutorial1.7