(Cal) First changes of repeat edition in cal
Merge remote-tracking branch 'origin/master' into cal

Conflicts:
	system/churchcal/calendar.js
Merge remote-tracking branch 'origin/master' into cal

Conflicts:
	system/churchcal/calendar.js
(Cal+CS) Rewrite the interfaces between CS and Cal with some new features
Merge remote-tracking branch 'origin/master' into cal

Conflicts:
	system/churchcal/cal_sources.js
	system/churchcal/calendar.js
(Cal) Finalize the changes of ChurchCal and ChurchService and ChurchResource
Merge branch 'cal'