Merge branch 'master'
Started on Validation
Finish Validation
Basic Header layout
Added Approve Accounts
Added Lastname and Firstname for Registration
Added Editor Page
Minifix
Merge branch 'feature/editor-page' into develop
Merge Complete
Added Geolocation
Added Search Bar for Location
Added Markers
-Add Markers
-Move Markers
-Radius around markers
-TODO Finish CollisionDetect
Created initial design
Made basic design
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
Started on Marker Routes
-Routes path not moving correctly when adding routes between.
Grundtemplate klar
Merge branch 'origin/develop'
Merge branch 'basic-design'
Rewrote Javascript to Module