Updates

minor tweaks
Merge branch 'master' of github.com:aniculescu/calendar

Conflicts:
	js/calendar.js