implement basic display of calendar with year & date
Merge remote-tracking branch 'origin/master' into calendar_library

Conflicts:
	.idea/workspace.xml