change
Merge remote-tracking branch 'origin/master'

Conflicts:
	Calendar/js/weekAttribute.js
change