Fixed code conventions in user settings, changed top-level page names
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
Merge remote-tracking branch 'glorf/master'
CXX Flags aren't definitions
resize actor collision boxes on death
remove actor's collisionbox on death
fixed weather code
Merge remote-tracking branch 'vheuken/master'