Give moderated spot a class
Let user choose between 'relevance' and 'stamp' in search function #1442
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Fixes #1154
Fixes #1857, #1959, #1978 ---Do not include the header if we want to redirect
Merge pull request #1988 from DirtyDutch/master

Fix for #1154, #1857, #1959, #1978