Merge branch 'r/Eerste_Sprint'
Merge branch 'dev' of https://github.com/waaghals/Tainted-Aberrant-Lion into f/search
Start for search made
Merge branch 'dev' into f/search
Added simple search
Merge branch 'dev' into f/search
Searchbar complete
Merge branch 'f/search' of https://github.com/waaghals/Tainted-Aberrant-Lion into f/searchbarz

Conflicts:
	Classes/PROJ/Views/MainMapView.phtml
searchbar edit
search update
Search function working, no display yet
zoekresultaten weergave
zoeken is af
Merge branch 'f/searchbarz' into dev

Conflicts:
	Classes/PROJ/Controllers/AjaxController.php
	Classes/PROJ/Views/Partial/TopJsIncludes.phtml
	css/style.css
	nbproject/private/private.xml