?
Merge branch 'master' of https://github.com/GtSnaker/bootstrap-calendar

Conflicts:
	component.json