Merge remote-tracking branch 'origin/master'

Conflicts:
	Calendar/index.html