first working
Merge branch 'master' of https://github.com/uraymeiviar/burst-plot-composer

Conflicts:
	app.js
	public/index.css
	public/js/burstplot-calc.js
	public/templates/plotitem.template