remove edit in OSM plugin
upgrade to django 1.5
Merge pull request #9 from chalobest/master

Update to Django and related 1.5