Refs #2135
 * Adding latest version of mousewheel
 * fixing line endings (why do I always have to do this, somehow it reverts itself...)
 * Fixing css bugs (they required the DOCTYPE to be changed, MAYBE THIS WILL BREAK SOMETHING? I wonder why we haven't changed the DOCTYPE before?)

OMG this is starting to be awesome!
Ok phpstorm is changing these line endings, I know why now (I should read these dialog boxes)
Merge remote-tracking branch 'origin/master'