1.2.1
Merge branch 'master' of github.com:enb-make/enb-bevis-helper

Conflicts:
	package.json