add edge option
Merge branch 'master' of https://github.com/isfeng/is-calendar

Conflicts:
	package.yml