# raise version to 1.3 and generate docu + dist
Merge branch 'develop'

Conflicts:
	package.json