Fixing to django 1.4
Merge branch 'master' of https://github.com/underbluewaters/marinemap