sync
Merge branch 'master' of https://github.com/ipublia/ipu-chart-editor

Conflicts:
	.gitignore