Updated the years on the new files
Merge remote-tracking branch 'origin/master'
Added the combobox
Fixing some mouse clicking issues with the combobox