Added Markers
-Add Markers
-Move Markers
-Radius around markers
-TODO Finish CollisionDetect
Finished Markers
-Collision
-Remove
Finish Markers

Conflicts:
	django-project/static/editor/javascript/mapeditor.js
	django-project/static/editor/style.css
	django-project/templates/editor/editor.html
Grundtemplate klar
Merge branch 'origin/develop'