Merge branch 'h/mailfix'
Merge branch 'r/Vierde_Sprint'
Added Type filter
Added reset button
Added documentation
Added all filters
Added database stuff for filters
Updated test document
Delete 29-04-14 Thijs.md
Added test scenarios
Fixed file extionsion
Begin for clustered markers with filters
Changed queries to querybuilders
Removed debugging code
Merge branch 'dev' into f/filterRealCountry

Conflicts:
	Classes/PROJ/Controllers/AjaxController.php
filter projecttype in commentaar
fixed test document
test document
Update 30-04-2014 Jelle.md
Now using markerCluster to handel the visibility of markers #98