Normalize Line Endings
Added some logging when loading up the properties file with invalud data
If user sets window width/height bigger than what they have, set it to
maximum width/height
merge upstream
Merge remote-tracking branch 'upstream/master'