Week, month, year select added
Merge remote-tracking branch 'origin/master' into Drew