synchronizing files
Merge branch 'master' of https://github.com/TytoLogy/NICal

Conflicts:
	NICal.m
Merge branch 'master' of https://github.com/TytoLogy/NICal into sjs_working

Conflicts:
	NICal.m