merge
Merge branch 'master' of https://github.com/thibautha/DatavizH3

Conflicts:
	app/scripts/main.js