Presentation for #27
Merge branch 'master' into new-recs

Conflicts:
	src/ControllerModules/UserControllerSuggestionsModule.php
Better outlook
Merge branch 'master' into new-recs
Changed pickup rule