Bumped up ics parser for new line delimiter
Merge branch 'master' into forking

Conflicts:
	package.json