further work on calendar creation

trying to figure out the 'last piece' before i can actually get the good
stuff goin....
Merge remote-tracking branch 'origin/master'

Conflicts:
	calendarwidget.php