Creating template
Merge branch 'master' of https://github.com/worldline/beekeeper

Conflicts:
	.openshift/cron/README.cron
	README.md
	package.json
test