update submodule
image directory relative to src
update
Merge branch 'master' into gh-pages

Conflicts:
	test/imports.js