WIP
Merge branch 'add-tests' of github.com:ipeychev/loader into add-tests

Conflicts:
	src/js/script-loader.js
WIP