added year-links command line switch
added year-links attribute
whitespace
Merge branch 'TB-year-links-cmd-line-switch' into development
Merge branch 'development'