Fixing the rebasing errors. This should be ready for pull request.
Update VideoSettingsScreen.java

Removed unused import.
Update ToggleMotionBlur.java

Added a boolean, will add functionality to this asap. (just a ready file for the advanced settings UI.)
Update VideoSettingsScreen.java

Removed yet an other unused import
Update Preset.java

Removed yet another bunch of dead code.
Delete ToggleMotionBlur.java

Now removed
Update VideoSettingsScreen.java

Removed unused things.
Update VideoSettingsScreen.java

ran checkstyle, fixed checkstyle errors.
Update videoMenuScreen.ui

Reformatted video Settings
Update videoMenuScreen.ui

added comma again.
Update VideoSettingsScreen.java

changed outLine, to outline in this file
Update videoMenuScreen.ui

Changed outLine, to outline in this file too.
Update videoMenuScreen.ui

Removed the right comma
Update Preset.java

removed UBERNOFILMGRAIN
Alt-Ctrl-L in IntelliJ ftw ! File was messy even before recent PR, this way it is tidy for the future
Tiny additional missed indent
Update videoMenuScreen.ui to include rendering distance, also including EXTREME render distance, meant for testing.
Doc update for stable build
Added whitelist candidate
Merge pull request #1130 from MovingBlocks/whitelist

Added whitelist candidate