Update calendar plugin
Merge origin/master

Conflicts:
	calendar/core/class/calendar.class.php