Javascript moth fix
Merge remote-tracking branch 'origin/master' into EventCalendar-PHP-Finnish

Conflicts:
	EventCalendar/EventItem.fs
	EventCalendar/index.html
merge fix