Merge branch 'user-supplied-params'

Conflicts:
	lib/AssetManager.js