Calendar added
	new file:   cal.js
	modified:   joy.js
	modified:   joyapp.js
	modified:   settings.js